Sync for 1.1.2.

svn path=/trunk/; revision=18347

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 ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: mail/mail-signature-editor.c:371
+#: mail/mail-signature-editor.c:372
 #, fuzzy
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
-"Saisissez le nom par lequel vous voulez désigner ce compte.\n"
-"Par example : « Travail » ou « Personnel »"
+msgid "Enter a name for this signature."
+msgstr "utiliser _HTML pour cette signature"
 
-#: 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 :"
 
@@ -13314,7 +13451,7 @@ msgstr ""
 "        « %s »\n"
 "Et ont été mis à jour."
 
-#: 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 "Dossiers virtuels"
 
@@ -13344,67 +13481,67 @@ msgstr "(Pas de sujet)"
 msgid "%s - Message"
 msgstr "%s - Message"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Répondu"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Messages non vus multiples"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Plus bas"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Plus haut"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: 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 "Aujourd'hui %H:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %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 "Generation de la liste des messages"
 
@@ -13473,45 +13610,71 @@ msgstr "Répondre à tous"
 msgid "Review"
 msgstr "Revoir"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr "Marquer à donner suite"
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Achevée"
+
+#: 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 "_Effacer les marqueurs"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Date d'échéance"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Nom du _fichier :"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Scrutation des dossiers sous  %s dans « %s »"
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Scrutation des dossiers de niveau root dans « %s »"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnement au dossier « %s »"
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Désabonnement du dossier « %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 "Dossier"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Enregistrer dans le dossier..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Veuillez sélectionner un serveur."
 
@@ -23409,12 +23572,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Pas de description"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Résumé de courrier"
 
-#: 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 "Dossiers locaux"
 
@@ -23424,23 +23587,23 @@ msgstr "Dossiers locaux"
 #. (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 "KPRX"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionnary.com du jour"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Citations du jour"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Ajouter un serveur de news"
 
-#: 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 "Saisissez l'URL du serveur de news que vous voulez ajouter"
 
@@ -23479,11 +23642,11 @@ msgstr "(Aucune description)"
 msgid "My Weather"
 msgstr "Ma Météo"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr "Il y a eu une erreur lors du téléchargement des données pour"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Météo"
 
@@ -24810,6 +24973,11 @@ msgstr ""
 "Impossible de transférer le dossier :\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Ouvrir dans %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25052,12 +25220,25 @@ msgid "Rename folder"
 msgstr "Renommer le dossier"
 
 #: 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 "Le nom de dossier spécifié n'est pas valide : %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 ""
+"Ne peut supprimer le dossier :\n"
+"« %s »"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25066,12 +25247,12 @@ msgstr ""
 "Ne peut créer le dossier spécifié :\n"
 "« %s »"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "_Créer un nouveau dossier..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nouveau..."
 
@@ -25101,20 +25282,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Veuillez sélectionner les informations que vous désirez importer :"
 
-#. 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 ""
-"Importation %s\n"
-"L'importateur n'est pas prêt.\n"
-"Attente de 5 secondes avant un nouvel essai."
-
-#: 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"
@@ -25123,22 +25291,22 @@ msgstr ""
 "Importation %s\n"
 "Importation élément %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Sélectionnez un Dossier"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Le fichier « %s » n'existe pas"
 
-#: 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 "Erreur 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"
@@ -25147,11 +25315,11 @@ msgstr ""
 "Il n'y a pas d'outils d'import capable de traiter\n"
 "%s."
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importation"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25160,17 +25328,17 @@ msgstr ""
 "Importation %s.\n"
 "Lancement %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Erreur au lancement de %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Erreur de chargement %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25179,31 +25347,31 @@ msgstr ""
 "Importation %s\n"
 "Importation élément 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automatique"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Sélectionner un fichier"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Type de fichier :"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Importer les données et règlages d'autres programmes"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importer un seul fichier"
 
-#: 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"
@@ -25211,24 +25379,24 @@ msgstr ""
 "Veuillez attendre...\n"
 "Recherche des paramétrages existants"
 
-#: 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 "Importateurs intelligents de démarrage"
 
-#: 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 "Sélectionnez un Dossier"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Sélectionnez un dossier de destination pour importer ces données"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importer"
 
@@ -25256,32 +25424,32 @@ msgstr "Synchronisation du dossier"
 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 "Alarme d'Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Ouverture du dossier %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 "Ouverture du dossier %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 "Ouvrir dans %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 "Impossible de renommer le dossier : %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 ""
@@ -25324,44 +25492,44 @@ msgstr "Le nom du dossier ne peut contenir de slashes."
 msgid "'.' and '..' are reserved folder names."
 msgstr " « . » et  « .. » sont réservés aux noms de dossiers."
 
-#: 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 n'a pas été trouvé dans votre $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 ne peut être exécuté."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "À propos de Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Aller au dossier..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Sélectionnez le dossier que vous voulez ouvrir"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Créer un nouveau raccourci"
 
-#: 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 "Sélectionnez le dossier que le raccourci doit pôinter :"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "Travail _En ligne"
 
-#: 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 "Travail _Hors ligne"
 
-#: 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 "Travail _Hors ligne"
 
@@ -25369,27 +25537,27 @@ msgstr "Travail _Hors ligne"
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affiché)"
 
-#: 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 "(Aucun)"
 
-#: 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 en ligne. Cliquez sur ce bouton pour travailler hors "
 "ligne."
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evloution va travailler hors ligne."
 
-#: 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 ""
@@ -25407,12 +25575,12 @@ msgstr ""
 "L'erreur du système d'activation est :\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut paramétrer le stockage 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"
@@ -25423,19 +25591,19 @@ msgstr ""
 "terminé de manière inattendue. Vous devrez relancer Evolution pour voir\n"
 "ces données à nouveau."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Arguments invalides"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Impossible enregistrer dans OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Erreur générique"
 
@@ -25574,58 +25742,62 @@ msgstr "Raccourcis"
 msgid "Checkbox"
 msgstr "Case à cocher"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le même nom existe déjà"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier spécifié n'est pas valide"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisamment d'espace pour créer le dossier"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Le dossier n'est pas vide"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Le dossier spécifié n'a pas été trouvé"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas implémenté dans ce stockage"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Opération non supportée"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Le type spécifié n'est pas supporté dans cette stockage"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Le dossier spécifié ne peut pas être modifié ou effacé"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ne peut faire un dossier un enfant de ses descendants"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Impossible de créer un dossier avec ce nom"
 
+#: 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 (...)"
@@ -25840,9 +26012,10 @@ msgstr ""
 "Veuillez cliquer sur le bouton « Suivant » pour continuer."
 
 #: 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 ""
@@ -25860,26 +26033,22 @@ msgid "Evolution Import Assistant"
 msgstr "Assistant d'importation"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Assistant d'importation"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Import de fichier (étape 3 parmis 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Type d'importation (étape 1 parmis 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Selectionner les outils d'importation (étape 2 parmis 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Sélectionnez un fichier (étape 2 parmis 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"
@@ -26091,10 +26260,10 @@ msgstr "Voir le contact courant"
 #: 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 "_Actions"
 
@@ -26212,7 +26381,7 @@ msgid "Print this item"
 msgstr "Imprimer cet élément"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -26239,7 +26408,7 @@ msgstr "Enregistrer cet élément sur le disque"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Fichier"
 
@@ -26321,7 +26490,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Planifier une réunion pour cet élément"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Adapter - Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26371,29 +26541,30 @@ msgid "Post a message to a Public folder"
 msgstr "Enregistrement du message dans le dossier"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "S'_abonner aux dossiers..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Afficher la fenêtre de prévisualisation de message"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "S'abonner ou se désabonner aux dossiers sur les serveurs externes"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "Éditeur de dossier _virtuel..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtres..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "Panneau d'_aperçu"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "S'_abonner aux dossiers..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Modifier les propriétés de ce dossier"
@@ -26489,7 +26660,7 @@ msgstr "List de messages par Fil de discussion"
 msgid "_Expunge"
 msgstr "_Nettoyer"
 
-#: 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 "_Dossier"
 
@@ -26789,7 +26960,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Rechercher un texte dans le corps du message affiché"
 
 #: 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 "Paramétrage de la page pour votre imprimante courante"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26897,7 +27069,7 @@ msgstr "_Cité"
 msgid "_Resend..."
 msgstr "_Renommer..."
 
-#: 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 "_Outils"
 
@@ -26912,12 +27084,12 @@ msgstr "Fermer cette fenetre"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_Fermer"
 
 #: 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 "Afficha_ge"
 
@@ -27091,7 +27263,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Enregistrer le contact et fermer la boîte de dialogue"
 
-#: 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_ide"
 
@@ -27256,7 +27428,7 @@ msgid "Open Other _User's Folder..."
 msgstr "_Créer un nouveau dossier..."
 
 #: 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
@@ -27273,113 +27445,133 @@ msgid "Pi_lot Settings..."
 msgstr "Paramétrage du Pilot..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Paramétrage du Pilot..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "_Créer un nouveau dossier..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Env./Recevoir"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Send queued items and retrieve new items"
 msgstr "Envoyer les éléments en attente et récupèrer les nouveaux"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Configuration de la messagerie"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuration de la messagerie"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Afficher les informations concernant Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Soumettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Soumettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Soumettre un rapport d'anomalies en utilisant Bug Buddy."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Commuter"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuter l'affichage de la barre de dossiers"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuter l'affichage de la barre de raccourcis"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Commuter si travail Hors ligne"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Voir le dossier sélectionné"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "FAQ Ximian Evolution"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "À _propos de Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "Barre de _dossier"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Dossier"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Déplacer..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Nouveau dossier"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Préférences du courrier"
+msgid "_Remove Other User's Folder"
+msgstr "_Créer un nouveau dossier..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "Envoyer/Recevoir"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Réglages"
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Barre de _raccourcis"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Raccourci"
@@ -27612,11 +27804,11 @@ msgstr "Codage caractères"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Éditeur de recherche"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Enregistrer la recherche"
 
@@ -27692,19 +27884,65 @@ msgstr "init_corba() : Ne peut initialiser GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 
-#~ msgid "Could not parse query string"
-#~ msgstr "Ne peut analyser la chaîne de recherche"
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "<- Supprimer"
 
-#~ msgid "Email is"
-#~ msgstr "Adresse est"
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Ajouter -&gt;"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Examen des nouveaux messages"
 
 #, fuzzy
-#~ msgid "<- _Remove"
-#~ msgstr "<- Supprimer"
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Le dossier n'est pas vide"
+
+#~ msgid "1 byte"
+#~ msgstr "1 octet"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u octets"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Vous avez oublié de choisir un dossier.\n"
+#~ "Revenez en arrière et spécifiez un dossier valide pour\n"
+#~ "y délivrer du courrier."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr ""
+#~ "%s ne peut être reconfigurer cr il ne s'agit pas d'un dossier local."
 
 #, fuzzy
-#~ msgid "_Add ->"
-#~ msgstr "Ajouter ->"
+#~ msgid "Type the name by which you would like to refer to this signature."
+#~ msgstr ""
+#~ "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
+#~ "Par example : « Travail » ou « Personnel »"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importation %s\n"
+#~ "L'importateur n'est pas prêt.\n"
+#~ "Attente de 5 secondes avant un nouvel essai."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Assistant d'importation"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Préférences du courrier"
+
+#~ msgid "Could not parse query string"
+#~ msgstr "Ne peut analyser la chaîne de recherche"
+
+#~ msgid "Email is"
+#~ msgstr "Adresse est"
 
 #~ msgid "This page can be used to configure Calendar and Task preferences"
 #~ msgstr ""
@@ -27788,15 +28026,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "Non participants"
 
-#~ msgid ""
-#~ "This message 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 ?"
-
 #~ msgid " _Refresh List "
 #~ msgstr "_Rafraîchir la liste "
 
@@ -28102,9 +28331,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "_Enable spell checking"
 #~ msgstr "_Activer la correction orthographique"
 
-#~ msgid "_Filename:"
-#~ msgstr "Nom du _fichier :"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "Signature _HTML :"
 
@@ -28414,9 +28640,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "seconds."
 #~ msgstr "secondes."
 
-#~ msgid "use _HTML for this signature"
-#~ msgstr "utiliser _HTML pour cette signature"
-
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "Composant pour le résumé"
 
diff --git a/po/ga.po b/po/ga.po
index 66fb4d53be..116dfb009c 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: locales 0.01\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-01-25 14:00-0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -319,11 +319,17 @@ msgstr "Ainm Chlainn"
 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 "Liost Tadhall"
+
+#: 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 "VCard do %s"
@@ -334,47 +340,47 @@ msgstr "VCard do %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 ""
 
-#: 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 "Ag Cuardaigh..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Ag L��d��il..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Cumraigh do %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 +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 "Tadhalla�"
@@ -485,29 +491,38 @@ msgstr "Freastala� LDAP"
 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 "Tadhalla�"
+
+#: 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 "Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "L��osta Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "Liost Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Scr�os an sceal seo"
@@ -545,7 +560,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 ""
 
@@ -553,24 +568,24 @@ msgstr ""
 msgid "Other Contacts"
 msgstr "Tadhalla� Eile"
 
-#: 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"
@@ -578,44 +593,54 @@ 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
-#, 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 "Te�p ag fork: %s"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "Pasfhocal do %s, le do thoil (�s�ideoir %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "Rphost 2"
 
-#: 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"
@@ -623,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"
@@ -631,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,53 +741,53 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Roghanna"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "_Scr�os"
-
-#: 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
 #, 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 "_Scr�os"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Roghanna"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -904,49 +929,55 @@ msgstr "Aon"
 
 #: 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 "Gn�th"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Gn�th"
 
-#: 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 "Cuardaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "T�g Gach Rud"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Scr�oste"
 
-#: 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"
@@ -957,7 +988,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"
@@ -966,46 +997,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 "Eolas"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Cumraigh do %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"
@@ -1013,7 +1044,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"
@@ -1022,7 +1053,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"
@@ -1030,7 +1061,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"
@@ -1040,7 +1071,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"
@@ -1050,34 +1081,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"
@@ -1085,11 +1116,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"
@@ -1098,25 +1129,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 "Seoladh Rpost:"
 
-#: 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
@@ -1124,16 +1155,16 @@ msgstr ""
 msgid "_Add"
 msgstr "_Suimigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_Suimigh"
 
-#: 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 ""
 
@@ -1142,34 +1173,34 @@ msgstr ""
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Af�iris"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Dealaigh gach rud"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Taispea�n"
 
-#: 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
@@ -1179,101 +1210,101 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Eagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "Eagar coinne"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Alairm 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 "_Roghanna"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Poirt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Gn�th"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "C_uardaigh..."
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "Ainm _Freastala�:"
 
-#: 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 "Cuntas %d"
 
-#: 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
 #, fuzzy
 msgid "cards"
 msgstr "Gan carta�"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Cumraigh do %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 "Gn�th"
 
-#: 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 "Cuardaigh"
@@ -1288,8 +1319,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"
@@ -1320,11 +1351,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 "T�g Tadhalla� o Leabhar Seoladh"
 
-#: 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 ""
 
@@ -1403,7 +1434,7 @@ msgid "D_epartment:"
 msgstr "_Rang:"
 
 #: 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 "Sonra�"
 
@@ -1463,13 +1494,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 "_Dealaigh"
 
@@ -1498,7 +1529,7 @@ msgid "_Web page address:"
 msgstr "Seoladh leathanach greas�n:"
 
 # US
-#: 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 "St�it Aontaithe Mheirice�"
@@ -1507,1227 +1538,1227 @@ msgstr "St�it Aontaithe Mheirice�"
 # ## Countries (Listed in ISO 3166-1)
 # ##
 # AF
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "An afganast�in"
 
 # AL
-#: 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 "An Alb�in"
 
 # DZ
-#: 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 "An Ailg�ir"
 
 # AS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr ""
 
 # AD
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr ""
 
 # AO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr ""
 
 # AI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr ""
 
 # AQ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "an tAntartasch"
 
-#: 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 ""
 
 # AR
-#: 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 ""
 
 # AM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr ""
 
 # AR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr ""
 
 # AU
-#: 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 "An Astr�il"
 
 # AT
-#: 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 "An Ostair"
 
 # AZ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr ""
 
 # BS
-#: 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 ""
 
 # BS
-#: 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 ""
 
 # FIXME
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "An Bhanglaid�is"
 
 # BB
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr ""
 
 # BY
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr ""
 
 # BE
-#: 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 "An Bheilg"
 
 # BZ
-#: 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 ""
 
 # BJ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Benin"
 msgstr ""
 
 # BM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr ""
 
 # BT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr ""
 
 # BO
-#: 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 "An Bholaiv"
 
-#: 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 ""
 
 # BW
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr ""
 
 # BV
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr ""
 
 # BR
-#: 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 "An Bhrasa�l"
 
 # IO
-#: 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 ""
 
 # BN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr ""
 
 # BG
-#: 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 "An Bhulg�ir"
 
 # BF
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Burkina Faso"
 msgstr ""
 
 # BI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burundi"
 msgstr ""
 
 # KH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr ""
 
 # CM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Camar�n"
 
 # CA
-#: 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 "Ceanada"
 
 # CV
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr ""
 
 # KY
-#: 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 ""
 
 # CF
-#: 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 ""
 
 # TD
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr ""
 
 # CL
-#: 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 "An tSile"
 
 # CH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "An tS�n"
 
 # CX
-#: 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 ""
 
 # CC
-#: 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 ""
 
 # CO
-#: 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 "An Chol�im"
 
 # KM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr ""
 
 # CG
-#: 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 "An Cong�"
 
 # CK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr ""
 
 # CR
-#: 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 "C�sta Rice"
 
-#: 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 ""
 
 # HR
-#: 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 ""
 
 # CU
-#: 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 "C�ba"
 
 # CY
-#: 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 "An Chipir"
 
 # CZ
-#: 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 ""
 
 # DK
-#: 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 "An Danmhairg"
 
 # DJ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr ""
 
 # DM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr ""
 
 # DO
-#: 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 ""
 
 # ET
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr ""
 
 # EC
-#: 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 "Eacuad�r"
 
 # EG
-#: 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 "An �igipt"
 
 # SV
-#: 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 "An tSalvad�ir"
 
 # GQ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr ""
 
 # ER
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr ""
 
 # EE
-#: 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 ""
 
 # ET
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "An Aet�ip"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr ""
 
 # FO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr ""
 
 # FJ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr ""
 
 # FI
-#: 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 "An Fhionlainn"
 
 # FR
-#: 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 "An Fhrainc"
 
 # fr 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Fraincis"
 
 # PF
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr ""
 
 # TF
-#: 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 ""
 
 # GA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr ""
 
 # GM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr ""
 
 # GE
-#: 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 ""
 
 # DE
-#: 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 "An Ghearm�in"
 
 # GH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "G�na"
 
 # GI
-#: 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 ""
 
 # GR
-#: 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 "An Ghr�ig"
 
 # GL
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "An Ghraonlainn"
 
 # GD
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr ""
 
 # GP
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr ""
 
 # GU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr ""
 
 # GT
-#: 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 "Guatamala"
 
 # GN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "An Ghuine"
 
 # GN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr ""
 
 # GY
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "An Ghu�in"
 
 # HT
-#: 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 "H��t�"
 
-#: 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 ""
 
 # HN
-#: 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 ""
 
 # HK
-#: 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 ""
 
 # HU
-#: 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 "An Ung�ir"
 
 # IS
-#: 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 "An �oslainn"
 
 # IN 
-#: 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 "An India"
 
 # ID
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "An Indin�is"
 
 # EI
-#: 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 "�ire"
 
 # IL
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Iosrael"
 
 # IT
-#: 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 "An Iod�il"
 
 # JM
-#: 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 "Iam�ice"
 
 # JP
-#: 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 "An tSeap�in"
 
 # JO
-#: 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 "An Iord�in"
 
 # kk 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr ""
 
 # KE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "An Ch�inia"
 
 # KI
-#: 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 ""
 
 # KW
-#: 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 "Cu�it"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr ""
 
 # LA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr ""
 
 # LV
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr ""
 
 # LB
-#: 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 "An Liob�in"
 
 # LS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr ""
 
 # LR
-#: 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 ""
 
 # LI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr ""
 
 # LT
-#: 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 ""
 
 # LU
-#: 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 "Lucsamburg"
 
 # MO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr ""
 
 # MK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr ""
 
 # MG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madagascar"
 
 # MW
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malawi"
 
 # MY
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "An Mhalaeisia"
 
 # mt
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr ""
 
 # ML
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Mali"
 
 # MT
-#: 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 "M�lta"
 
 # MH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Marshall Islands"
 msgstr ""
 
 # MQ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr ""
 
 # MR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr ""
 
 # mr
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 #, fuzzy
 msgid "Mauritius"
 msgstr "Marata�"
 
 # YT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr ""
 
 # MX
-#: 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 "Meicsiceo"
 
 # ID
-#: 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 ""
 
 # MC
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "Monac�"
 
 # MN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "An Mh�ng�il"
 
 # MS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr ""
 
 # MA
-#: 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 "Marac�"
 
 # FIXME
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "M�saimbic"
 
 # MM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr ""
 
 # NA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr ""
 
 # na 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "N�r�is"
 
 # NP
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "Neipe�l"
 
 # NL
-#: 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 "An Isiltir"
 
 # AN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr ""
 
 # NC
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr ""
 
 # NZ
-#: 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 "An Nua-Sh�alainn"
 
 # NI 
-#: 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"
 
 # NE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "An N�gir"
 
 # NG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "An Nig�ir"
 
 # NU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr ""
 
 # NF
-#: 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 ""
 
 # MP
-#: 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 ""
 
 # NO
-#: 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 "An Iorua"
 
 # OM
-#: 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 ""
 
 # PK
-#: 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 "An Phacast�in"
 
 # PW
-#: 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 "An Phalaist�n"
 
 # PA
-#: 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 ""
 
 # PG
-#: 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 ""
 
 # PY
-#: 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"
 
 # PE
-#: 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 "Peiri�"
 
 # PH FIXME
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "Na hOile�in"
 
 # PI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr ""
 
 # PL
-#: 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 "An Pholainn"
 
 # PT
-#: 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 "An Phortaing�il"
 
 # PR
-#: 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 ""
 
 # QA
-#: 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 ""
 
 # RE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr ""
 
 # RO 
-#: 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 "An R�m�in"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr ""
 
 # RW
-#: 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 ""
 
 # LC
-#: 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 ""
 
 # WS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr ""
 
 # SM
-#: 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 ""
 
 # SA
-#: 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 "An Araib"
 
 # SN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr ""
 
 # SC
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr ""
 
 # SL
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr ""
 
 # SG
-#: 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 "Singeap�r"
 
 # SK
-#: 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 ""
 
 # SI
-#: 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 ""
 
 # SB
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr ""
 
 # SO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr ""
 
 # ZA 
-#: 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 ""
 
 # ES
-#: 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 "An Sp�inn"
 
 # LK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Sr� Lanca"
 
-#: 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 ""
 
 # SD
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "An tS�d�in"
 
 # SR
-#: 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 ""
 
 # SZ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr ""
 
 # SE
-#: 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 "An tSualainn"
 
 # CH
-#: 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 "An Eilv�is"
 
 # TW
-#: 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 ""
 
 # TJ
-#: 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 ""
 
 # TH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "An T�alainn"
 
 # TG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr ""
 
 # TK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr ""
 
 # TO
-#: 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 ""
 
 # TN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "An T�in�is"
 
 # TR
-#: 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 "An Tuirc"
 
 # TM
-#: 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 ""
 
 # TV
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr ""
 
 # UG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "Uganda"
 
 # UA
-#: 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 ""
 
 # AR
-#: 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 "Aontas na n�im�r�ochta� Arabacha"
 
 # UK
-#: 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 "An R�ocht"
 
 # UM
-#: 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 ""
 
 # UY
-#: 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 "Uragua"
 
 # UZ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr ""
 
 # VU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr ""
 
 # VE
-#: 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 "Veinis�ala"
 
 # VN
-#: 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 "Vitneam"
 
-#: 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 ""
 
 # EH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr ""
 
 # YE
-#: 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 "�imin"
 
 # YU
-#: 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 "An I�glaiv"
 
 # ZM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "An tSaimbia"
 
 # ZW
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "An tSiomb�ib"
 
@@ -2763,20 +2794,20 @@ msgstr "TTY/TDD"
 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 "Eagar Ainm Fhada"
 
-#: 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 "Ainm Fhada"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "R-phost"
 
@@ -2796,6 +2827,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 "Seoladh _2:"
@@ -2926,7 +2969,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
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "S�bh�il mar VCard"
@@ -2973,7 +3016,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 ""
 
@@ -2982,25 +3025,25 @@ msgstr ""
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 card"
 
 # FIXME : Grammar ? 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d carta�"
 
-#: 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"
@@ -3012,10 +3055,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 "iEarraidh gan Aithne"
 
@@ -3023,7 +3066,7 @@ msgstr "iEarraidh gan Aithne"
 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 ""
@@ -3044,8 +3087,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 "Ceangailte"
 
@@ -3096,7 +3139,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 ""
 
@@ -3113,9 +3156,8 @@ msgstr "Taispea�n"
 #: 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
@@ -3205,7 +3247,7 @@ msgstr "Leabhar Seoladh:"
 
 #: 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 "S�bh�il mar VCard"
@@ -3292,7 +3334,7 @@ msgstr "C�ip"
 msgid "Paste"
 msgstr "Greamaigh"
 
-#: 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
@@ -3300,8 +3342,8 @@ msgstr "Greamaigh"
 msgid "Delete"
 msgstr "Dealaigh"
 
-#: 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 "Radharc Carta"
@@ -3310,7 +3352,7 @@ msgstr "Radharc Carta"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c: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,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
 
@@ -3318,11 +3360,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c: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,Mc,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"
@@ -3446,7 +3488,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 ""
 
@@ -3471,7 +3513,7 @@ msgid "Options"
 msgstr "Roghanna"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Treoshu�omh"
 
@@ -3494,7 +3536,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 "Portr�id"
 
@@ -3556,20 +3598,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 "Ard"
 
 #: 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 "Gn�th"
 
 #: 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 "Bun"
 
@@ -3580,13 +3622,17 @@ msgstr "Bun"
 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 ""
 
@@ -3703,11 +3749,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "Eagar coinne"
 
-#: 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"
@@ -3715,13 +3761,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 "Rabhadh"
 
-#: 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 "
@@ -3732,15 +3778,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 "T�ip ag tosnaithe 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 ""
 
@@ -3789,7 +3835,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 ""
@@ -3863,9 +3909,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
@@ -3882,13 +3928,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 "T�"
 
 #: 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 "N�l"
 
@@ -3908,85 +3954,103 @@ msgstr "Radharc Seachtain"
 msgid "Month View"
 msgstr "Radharc M�"
 
-#: 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 "Feilire"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr ""
 
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Priont�il Feilire"
+
+#: calendar/gui/component-factory.c:77
+msgid "Public folder containing appointments and events"
+msgstr ""
+
 # tg
-#: 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: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 "Teascanna"
 
-#: 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 "Priont�il Carta�"
+
+#: calendar/gui/component-factory.c:87
+msgid "Public folder containing to-do items"
+msgstr ""
+
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Cruthaigh Coinne _Nua"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Bealach Nuacht�in"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "�lbachta�"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Teasc"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 #, fuzzy
 msgid "Create a new task"
 msgstr "Cruthaigh _Teasc Nua"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Cruthaigh Coinne _Nua"
@@ -4029,25 +4093,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
@@ -4074,110 +4138,110 @@ msgstr "uair"
 msgid "minutes"
 msgstr "noimea�d"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d la(e)"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr " 1 l�"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr " %d seachtain"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 seachtain"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr " %d uaireanta"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr " 1 uair"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr " %d noime�id"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr " 1 noime�d"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d soic�nd"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr " 1 soic�nd"
 
-#: 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 "Taispe�in teachtaireacht"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Post r�omhphost"
 
-#: 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 ""
@@ -4199,7 +4263,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 "Coimri�:"
 
@@ -4283,7 +4347,7 @@ msgid "Days"
 msgstr "Lae"
 
 #: 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 "Aoine"
 
@@ -4296,7 +4360,7 @@ msgid "Minutes"
 msgstr "Noimea�d"
 
 #: 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 "Luain"
 
@@ -4306,7 +4370,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: 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 "Sathairn"
 
@@ -4319,7 +4383,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 "Domhnaigh"
 
@@ -4337,7 +4401,7 @@ msgid "Task List"
 msgstr "L�osta _Teasc"
 
 #: 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 "Deardaoin"
 
@@ -4354,7 +4418,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 "Mairt"
 
@@ -4363,7 +4427,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 "Ce�daoin"
 
@@ -4584,8 +4648,8 @@ msgid "No summary"
 msgstr "Gan coimri�"
 
 #: 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 "S�nbh�il le..."
 
@@ -4654,27 +4718,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 "Coinne"
 
-#: 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 ""
 
@@ -4744,19 +4808,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 ""
 
@@ -4796,7 +4860,7 @@ msgid "Member"
 msgstr "Ball"
 
 #: 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"
@@ -4808,7 +4872,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 "St�das"
@@ -4884,48 +4948,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 "l�osta"
 
-#: 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 "soic�nd"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Eile"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "Tuaisceart"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "l�osta"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Facs Eile"
 
-#: 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 "l�"
 
-#: 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 ""
 
@@ -5019,7 +5083,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 "Freagra"
 
@@ -5028,7 +5092,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:"
 
@@ -5040,17 +5104,17 @@ msgstr "Tosa�ocht"
 msgid "_Status:"
 msgstr "_St�das:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Gn�th"
 
-#: 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 "Coinne"
 
-#: 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:"
@@ -5120,13 +5184,13 @@ 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
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Scr�os an sceal seo"
 
-#: 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 "_Osc�il"
@@ -5136,31 +5200,31 @@ msgstr "_Osc�il"
 msgid "_Save as..."
 msgstr "S�nbh�il le..."
 
-#: 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 "_Priont�il..."
 
-#: 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 "G_earr"
 
-#: 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 "_C�ip"
 
 # PS
-#: 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
@@ -5191,12 +5255,12 @@ msgstr "% Rinneadh:"
 msgid "_Delete Selected Tasks"
 msgstr "Scr�os an sceal seo"
 
-#: 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 ""
@@ -5211,8 +5275,8 @@ msgstr ""
 msgid "Alarms"
 msgstr "Af�iris"
 
-#: 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 ""
 
@@ -5241,7 +5305,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 "Coimri�"
@@ -5305,468 +5369,474 @@ msgstr "rn"
 msgid "pm"
 msgstr "in"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "_Coinne Nua"
 
-#: 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 "Bealach Nuacht�in"
 
-#: 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 "Teasc Nua"
 
-#: 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 "Cl�d�il..."
 
-#: 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 "Socraigh Fillte�in..."
 
-#: 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 "Socraigh Fillte�in..."
 
-#: 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 "_S�bh�il Mar..."
 
-#: 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 "Ag Fanacht..."
 
-#: 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 "Ag L�d�il feilire..."
 
-#: 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
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Cr�ochnaithe "
 
-#: 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 "eolas fheilire"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Feilire"
 
-#: 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 "iEarraidh gan Aithne"
 
 #. 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 "<i>Ar bith</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_St�das:"
 
-#: 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 "Gan Aithne"
 
-#: 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 "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: 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 "Ceart go Leor"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 #, fuzzy
 msgid "Accept"
 msgstr "Cuntas"
 
-#: 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 "Dealaigh"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Eolas"
 
-#: 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 "Eolas Theasc"
 
 # FR
-#: 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 "An Fhrainc"
 
-#: 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
 #, fuzzy
 msgid "Meeting Information"
 msgstr "eolas fheilire"
 
-#: 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 "_Dealaigh gach rud"
 
-#: 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 "�lbachta�"
 
-#: 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
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Freagrair"
 
-#: 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
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Post an sce�l seo"
 
-#: 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 "Eolas Theasc"
 
-#: 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
 #, fuzzy
 msgid "Task Update"
 msgstr "Data"
 
-#: 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
 #, fuzzy
 msgid "Task Reply"
 msgstr "Freagrair"
 
-#: 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 "Eolas Theasc"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Teachtaireacht Feilire"
 
-#: 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
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Eolas"
 
-#: 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
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Post an sce�l seo"
 
-#: 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 "Te�p ag fork: %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 "Te�p ag fork: %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 "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Fillte�n _Nua"
@@ -5815,7 +5885,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr "Cathlaoirlaig"
 
-#: 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 ""
 
@@ -5830,54 +5900,54 @@ msgstr "Goireas"
 
 # IN 
 #: 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 "Pearsanta"
 
 #: 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 "Grupa"
 
 #: 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 "Goireas"
 
 #: 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 "Seomra"
 
 # th
 #: 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 "T�alainnis"
 
 #: 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 ""
 
@@ -5967,41 +6037,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
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt an t-eolaire %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 ""
 
-#: 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 "Te�p ag fork: %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 ""
+"Earraidh ag s�bhh�il sc�ala� do: %s\n"
+" %s"
+
+#: 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 "Scr�os an sceal seo"
 
-#: 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
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Coinne Nua..."
@@ -6016,7 +6095,18 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1734
+# ##
+# ## Languages (ISO 639 code in brackets)
+# ## 	The 'msgid' names and spellings for languages are those listed
+# ##     in iso-639.def from glibc
+# aa 
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Alairm on %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6024,7 +6114,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"
@@ -6032,12 +6122,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 "Osc�il Feilire"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Ag oscailt an t-eolaire %s"
@@ -6106,54 +6196,64 @@ msgstr "D. F�mhair"
 msgid "September"
 msgstr "M. F�mhair"
 
-#: 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 "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "Eolas Cuntais"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Eolas"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 msgid "Calendar information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Data"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Freagrair"
 
-#: 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 "Eolas"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "eolas fheilire"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6398,7 +6498,7 @@ msgid "Print Calendar"
 msgstr "Priont�il Feilire"
 
 #: 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 "Priont�il Reamhtaispe�ntais"
@@ -6420,7 +6520,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"
@@ -6428,12 +6528,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
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Priont�il Carta�"
@@ -6492,130 +6592,135 @@ 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
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Teachtaireacht Feilire"
 
-#: 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 "Feilire"
 
-#: 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 "Earraidh Eile"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8265,81 +8370,81 @@ msgstr "Ag oscailt an t-eolaire %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 ""
 
-#: 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 "ag sioncronaich filtean"
 
-#: 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
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "_Post sce�l"
 
-#: 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 "Te�p ag fork: %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 "Te�p ag fork: %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 ""
@@ -8382,12 +8487,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 "Post an sce�l seo"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Post an sce�l seo"
@@ -8692,7 +8797,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 ""
 
@@ -8748,51 +8853,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 "Ag dealaigh fillte�n %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 ""
 
@@ -8982,7 +9087,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"
@@ -8991,11 +9096,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 ""
 
@@ -9012,7 +9117,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"
@@ -9064,69 +9169,77 @@ msgstr "Te�p ag fork: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Te�p ag fork: %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 "SMTP freastala� %s"
+
+#: 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:395
+#: 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
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Ag S�bh�il scealta"
 
-#: 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 "_Post sce�l"
 
-#: 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
@@ -9140,7 +9253,7 @@ 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
@@ -9148,21 +9261,17 @@ msgstr ""
 msgid "No such message"
 msgstr "Post an sce�l seo"
 
-#: 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 ""
 
@@ -9179,6 +9288,11 @@ msgstr "Te�p ag fork: %s"
 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 "Te�p ag fork: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr ""
@@ -9225,74 +9339,69 @@ msgstr "Pasfhocal"
 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 freastala� %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 freastala� %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 ""
 
-#: 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 "Te�p ag fork: %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 "Ag oscailt an t-eolaire %s"
 
-#: 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"
@@ -9300,24 +9409,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
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sce�l seo"
 
-#: 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 "Earraidh gan aithne: %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 ""
 
@@ -9391,8 +9500,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 ""
@@ -9404,7 +9513,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 ""
@@ -9418,32 +9527,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 "Te�p ag fork: %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 "Te�p ag fork: %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 ""
 
@@ -9464,6 +9573,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"
@@ -9473,12 +9583,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"
@@ -9502,7 +9614,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
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Te�p ag fork: %s"
@@ -9531,7 +9644,7 @@ msgid "Storing folder"
 msgstr "Ag stoir filtean"
 
 #: 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 ""
@@ -9692,40 +9805,45 @@ msgstr "N�l aon Eolaire `%s' ann."
 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 "N�l aon Eolaire `%s' ann."
 
-#: 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
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "N�l aon Eolaire `%s' ann."
+
+#: camel/providers/local/camel-spool-store.c:193
 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
 #, c-format
 msgid "Spool folder tree %s"
 msgstr ""
 
-#: 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 ""
 
@@ -9816,49 +9934,49 @@ msgstr "An Fhrainc"
 msgid "Operation failed: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: 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 "Ceangailte"
 
-#: 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 "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Scr�os an sceal seo"
 
-#: 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 "Post an sce�l seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "iEarraidh gan Aithne"
@@ -10117,40 +10235,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"
@@ -10158,89 +10276,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 freastala� %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 ""
 
-#: 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 "Post an sce�l seo"
 
-#: 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
 #, fuzzy
 msgid "HELO response error"
 msgstr "Earraidh Eile"
 
-#: 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 ""
@@ -10248,76 +10366,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 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u bytanna"
-
-#: 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 "iat�n"
 
-#: 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 ""
 
@@ -10351,7 +10460,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 ""
 
@@ -10362,7 +10471,7 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr ""
 
@@ -10370,38 +10479,38 @@ 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 "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Do:"
 
-#: 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."
@@ -10410,12 +10519,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "_Poirt:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "(Gan Tuarascail)"
@@ -10430,55 +10539,55 @@ msgstr ""
 msgid "Could not create a PGP signature context"
 msgstr "Te�p ag fork: %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 "Rabhadh!"
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10487,61 +10596,80 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %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?"
 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 "Osc�il Comhad"
 
 # SG
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Singeap�r"
 
-#: 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 ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
 
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
@@ -10592,8 +10720,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?"
@@ -10754,8 +10882,9 @@ msgid "years"
 msgstr "bliana"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
-msgstr ""
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Ainm St�l:"
 
 #: filter/filter-datespec.c:269
 msgid "<click here to select a date>"
@@ -10811,13 +10940,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 "Ainm St�l:"
 
-#: 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
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillte�n _Nua"
@@ -10830,7 +10958,7 @@ msgid ""
 msgstr ""
 
 # IR
-#: 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 ""
@@ -11007,225 +11135,229 @@ msgid "Beep"
 msgstr "An Bheilg"
 
 #: 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 ""
 
 # mt
-#: 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 "Scr�oste"
 
+#: filter/libfilter-i18n.h:12
+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"
-msgstr ""
+# PE
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#, fuzzy
+msgid "Label"
+msgstr "_Larger"
 
 #: 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 ""
 
+# PL
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
+#, fuzzy
+msgid "Play Sound"
+msgstr "An Pholainn"
+
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+msgid "Read"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
+#: 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
-#, fuzzy
-msgid "is before"
-msgstr "riomh"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
+msgid "Run Once"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
+# Avoid; either use KR or KP
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Sc�r"
+
+#: 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 "Teoranta"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-# PE
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
-#, fuzzy
-msgid "Label"
-msgstr "_Larger"
+msgid "Size (kB)"
+msgstr "M�id (kB)"
 
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
+#: filter/libfilter-i18n.h:35
+msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
-msgid "Message Body"
+#: filter/libfilter-i18n.h:36
+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"
-msgstr ""
+#: 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 "Abair"
 
+# US
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
-msgstr ""
+#, fuzzy
+msgid "Unset Status"
+msgstr "St�it Aontaithe Mheirice�"
 
-# PL
 #: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Play Sound"
-msgstr "An Pholainn"
+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
-#, fuzzy
-msgid "returns"
-msgstr "GN"
+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 ""
 
-# Avoid; either use KR or KP
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Sc�r"
+#: 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 "Teoranta"
+msgid "is before"
+msgstr "riomh"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "M�id (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"
-msgstr "Abair"
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "GN"
 
-# US
 #: filter/libfilter-i18n.h:61
-#, fuzzy
-msgid "Unset Status"
-msgstr "St�it Aontaithe Mheirice�"
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr ""
 
 #: filter/rule-editor.c:180
 msgid "Rules"
@@ -11261,31 +11393,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 "F�n le do thoil"
 
-#: 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 "Ag Oscailt '%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"
 
@@ -11342,39 +11474,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 "Bruscar"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Ag Oscailt '%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 "�lbachta�"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "_Fillte�n"
 
-#: 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?"
@@ -11485,104 +11617,113 @@ 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 "�lbachta�..."
 
-#: 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 "Ag S�bh�il scealta"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Teachaireacht Post Nua"
 
 # mt
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Sc�al R�omhphost"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Cruthaigh Sc�al _Nua"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Sce�l Nua"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Post an sce�l seo"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Teachaireacht Post Nua"
 
-#: 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 "Alairm Evolution"
 
-#: 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 "Ag Cealaigh..."
 
-#: 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 "Albachta� do \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "�lbacta�"
 
-#: 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 ""
@@ -11628,137 +11769,137 @@ msgstr ""
 msgid "%d total"
 msgstr "%d �oml�n"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Fillte�n _Nua"
 
-#: 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
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Priont�il"
 
-#: 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 "Freagrair do L�osta"
 
-#: 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 "Freagrair do _Gach rud"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Sheoladh Chuig duine"
 
-#: 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 "Cr�ochnaithe"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Glan"
 
 #. 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
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Athdealaigh"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: 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 "_C�ip do Fillte�n..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Suim Leabhar Seoladh"
 
-#: 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
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Teachtaireacht Feilire"
 
-#: 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 ""
@@ -11829,20 +11970,20 @@ 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 "_�st:"
 
-#: 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 "Ainm _�saideoir"
 
-#: 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 "_Sl�:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11859,14 +12000,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 "M�chumasach"
 
 #: 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 "Chumasach"
 
@@ -11944,8 +12085,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
@@ -11979,78 +12120,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 ""
 
-#: 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 ag %H:%M, scr�obh %%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 ""
 
-#: 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 "S�bh�il Sc�al Mar..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "S�bh�il Sc�ala Mar..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Scr�os an sceal seo"
 
-#: 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"
@@ -12058,71 +12199,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 ""
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: 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
 #, fuzzy
 msgid " [script]"
 msgstr "(Gan Tuarascail)"
 
-#: 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 "n"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 msgid "Add script signature"
 msgstr ""
 
 # SG
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Singeap�r"
@@ -12164,16 +12305,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Cuntas"
 
-#: 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 ""
 
@@ -12858,77 +12999,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 ""
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "_Iat�n"
 
-#: 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 "Osc�il san %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 ""
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Post an sce�l seo"
 
-#: 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 "%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 "S�bh�il Iomha le..."
 
@@ -12937,147 +13074,143 @@ msgstr "S�bh�il Iomha le..."
 msgid "Pinging %s"
 msgstr "Ag Oscailt '%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 "D�ta"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Droch Seoladh"
 
-#: 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 "Freagrair-Do"
 
-#: 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 "Do"
 
-#: 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 "Post"
 
-#: 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 "Te�p ag fork: %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 "_Fillte�n"
 
-#: 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 "Te�p ag fork: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Te�p ag fork: %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 ""
 
-#: 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 ""
-
 # c-format
-#: 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 ""
@@ -13313,21 +13446,21 @@ msgstr "Ag Fanacht..."
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Scr�os an teasc seo"
 
-#: 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 "Pasfhocal do %s, le do thoil"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
@@ -13336,22 +13469,22 @@ msgstr "Pasfhocal, le do thoil"
 msgid "Could not save signature file: %s"
 msgstr "Te�p ag fork: %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 "Ainm:"
 
@@ -13387,7 +13520,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 ""
 
@@ -13418,67 +13551,67 @@ msgstr "(Gan abair)"
 msgid "%s - Message"
 msgstr "%s - Sce�l"
 
-#: 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 "Inni� %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Inn� %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: 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 ""
 
@@ -13554,45 +13687,70 @@ msgstr "Freagrair do gach rud"
 msgid "Review"
 msgstr "Reamhthaispe�intas"
 
-#: 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 "Cr�ochnaithe"
+
+#: 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 "Glan"
+
+#: mail/message-tags.glade.h:8
+msgid "_Due by:"
+msgstr ""
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Ainm Chomad:"
+
+#: 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 "Fillte�n"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: 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 ""
 
@@ -24669,12 +24827,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "(Gan Tuarascail)"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Coimri� phoist"
 
-#: 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 "_Fillte�n"
@@ -24685,23 +24843,23 @@ msgstr "_Fillte�n"
 #. (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 Focal do Lae"
 
-#: 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 ""
 
@@ -24742,11 +24900,11 @@ msgstr "(Gan Tuarascail)"
 msgid "My Weather"
 msgstr "Aimsir"
 
-#: 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 "Aimsir"
 
@@ -26087,6 +26245,11 @@ msgid ""
 "%s"
 msgstr "Te�p ag fork: %s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Osc�il san %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -26298,24 +26461,35 @@ msgid "Rename folder"
 msgstr "Ag oscailt an t-eolaire %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 "Ag oscailt an t-eolaire %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 "Fillte�n _Nua"
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nua..."
 
@@ -26340,122 +26514,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 "Fillte�n _Nua"
 
-#: 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 "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 ""
 
-#: 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 "Ainm Chomad:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "T�g Comhad"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Cin�al Comhad:"
 
-#: 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 "� %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "T�g Fillte�n"
 
-#: 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 ""
 
@@ -26483,32 +26647,32 @@ msgstr "ag sioncronaich filtean"
 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 "Ag oscailt an t-eolaire %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 "Ag oscailt an t-eolaire %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 "Osc�il san %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 "Te�p ag fork: %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 ""
 
@@ -26545,45 +26709,45 @@ 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 "Faoi 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 "Scr�os an sceal seo"
 
-#: 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 "Sheoladh Chuig duine"
 
-#: 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 ""
 
@@ -26591,25 +26755,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 "%s (%d)"
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(Ar Bith)"
 
-#: 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 ""
@@ -26622,12 +26786,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"
@@ -26635,19 +26799,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 ""
 
@@ -26789,59 +26953,63 @@ msgstr ""
 msgid "Checkbox"
 msgstr "T�alainnis"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Gan Earraidh"
 
-#: 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 "Earraidh I/A"
 
-#: 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 "Te�p ag fork: %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 (...)"
@@ -27046,7 +27214,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 ""
@@ -27060,26 +27228,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"
@@ -27298,10 +27462,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 ""
 
@@ -27422,7 +27586,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 "S�bh�il"
 
@@ -27449,7 +27613,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 "_Comhad"
 
@@ -27532,8 +27696,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 "Faoi Evolution..."
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -27582,30 +27747,30 @@ msgid "Post a message to a Public folder"
 msgstr "Fillte�n _Nua"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "S�bh�il 'san _fillte�n"
+
+#: 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
-#, fuzzy
-msgid "_Subscribe to Folders..."
-msgstr "S�bh�il 'san _fillte�n"
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
@@ -27705,7 +27870,7 @@ msgstr "Post an sce�l seo"
 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 "_Fillte�n"
 
@@ -28033,7 +28198,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
@@ -28153,7 +28318,7 @@ msgstr "Sheoladh Chuig duine"
 msgid "_Resend..."
 msgstr "_Osc�il..."
 
-#: 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 "_Uirlis�"
 
@@ -28168,12 +28333,12 @@ msgstr "D�n an fhuinneog seo"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_D�n"
 
 #: 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 "_Radharc"
 
@@ -28350,7 +28515,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 "C_�idi�"
 
@@ -28521,7 +28686,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Fillte�n _Nua"
 
 #: 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
@@ -28538,114 +28703,134 @@ msgid "Pi_lot Settings..."
 msgstr "Albachta� Phoist"
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Albachta� Phoist"
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution.xml.h:29
 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
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Socr� Post"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Socr� Post"
 
-#: 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
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "_Faoi Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_C�ip..."
 
-#: 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 "_Fillte�n"
 
-#: 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
 #, fuzzy
 msgid "_Import..."
 msgstr "Chl�_fhoireann..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Bog..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nua"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Roghanna Feilire"
+msgid "_Remove Other User's Folder"
+msgstr "Fillte�n _Nua"
 
-#: 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 "�lbachta�"
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Faoi..."
@@ -28901,11 +29086,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 ""
 
@@ -28985,6 +29170,24 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
 #, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "_Scr�os"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Suimigh"
+
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u bytanna"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Roghanna Feilire"
+
+#, fuzzy
 #~ msgid "Could not parse query string"
 #~ msgstr "Te�p ag fork: %s"
 
@@ -29133,10 +29336,6 @@ msgstr ""
 #~ msgstr "Taispe�in"
 
 #, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Ainm Chomad:"
-
-#, fuzzy
 #~ msgid "_Language:"
 #~ msgstr "Teanga"
 
@@ -29155,14 +29354,6 @@ msgstr ""
 #~ msgid "Riga"
 #~ msgstr "Deis:"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Suimigh"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "_Scr�os"
-
 #~ msgid "Edit Addressbook"
 #~ msgstr "Eagar Leabhar Sheoladh"
 
@@ -29179,14 +29370,6 @@ msgstr ""
 #~ msgstr "_Eile"
 
 #, fuzzy
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Eolas"
-
-#, fuzzy
-#~ msgid "iCalendar information"
-#~ msgstr "eolas fheilire"
-
-#, fuzzy
 #~ msgid "Could not encrypt data: invalid user key: \"%s\"."
 #~ msgstr "Te�p ag fork: %s"
 
diff --git a/po/gl.po b/po/gl.po
index 2b71f7c9d4..d48b6da545 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,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-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fern�ndez Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -344,11 +344,17 @@ msgstr "Nome Completo:"
 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 "Contacto Sen Nome"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -359,51 +365,51 @@ msgstr "VCard de %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 "Non foi posible 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
 #, fuzzy
 msgid "Searching..."
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 #, fuzzy
 msgid "Loading..."
 msgstr "Agardando..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Conectando ao servidor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Conectando ao servidor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando as tarxetas..."
 
-#: 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 "Erro ao elimina-la tarxeta"
@@ -422,13 +428,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook non 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 "Non foi posible iniciar o 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 "Non foi posible iniciar wombat"
@@ -497,10 +503,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "F�brica para o control de exemplo do Libro de Enderezos"
 
 #: 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"
@@ -519,29 +525,39 @@ msgstr "Servidor NNTP:"
 msgid "LDAP server containing contact information"
 msgstr "Cartafol que cont�n 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 "Cartafol que cont�n informaci�n de contacto"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Novo 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 un novo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 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 unha nova lista de contactos"
@@ -593,7 +609,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL non est� soportado nesta versi�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 "Non foi posible inicializar gnome-vfs"
 
@@ -601,11 +617,11 @@ msgstr "Non foi posible inicializar gnome-vfs"
 msgid "Other Contacts"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c: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."
@@ -613,7 +629,7 @@ msgstr ""
 "Non foi posible abrir este libro de enderezos. Por favor, comprobe\n"
 "que a ruta existe e que ten permisos para acceder a ela."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -624,7 +640,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP est�\n"
 "f�ra de servicio"
 
-#: 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"
@@ -636,7 +652,7 @@ msgstr ""
 "debe compilar o programa desde as fontes do CVS\n"
 "logo de obter OpenLDAP desde o enlace de abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -647,38 +663,51 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP est�\n"
 "f�ra de servicio"
 
-#: 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 ""
+"Non foi posible autenticarse co 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 "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "A categor�a �"
 
 #. 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 "Calquera campo cont�n"
 
-#: 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"
@@ -686,7 +715,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"
@@ -694,25 +723,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 "Calquera Categor�a"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que ha amosar o Navegador de Cartafoles"
 
@@ -780,53 +809,53 @@ msgstr "Dete_ctar tipos soportados "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Opci�ns"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "_Eliminar"
-
-#: 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
 #, 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 "_Eliminar"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opci�ns"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -963,51 +992,57 @@ msgstr "�nico"
 
 #: 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 "Opci�ns por defecto"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Opci�ns por defecto"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "�mbito da busca:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h: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 "Buscar M_ensaxe..."
 
-#: 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 "Eliminada"
 
-#: 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"
@@ -1018,7 +1053,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"
@@ -1027,47 +1062,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 da Fonte"
 
-#: 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 ao 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 "Armacenar busca como CartafolV"
 
-#: 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"
@@ -1075,7 +1110,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"
@@ -1084,7 +1119,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"
@@ -1092,7 +1127,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"
@@ -1102,7 +1137,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"
@@ -1112,27 +1147,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 "
@@ -1142,7 +1177,7 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. S� se empregar� para "
 "amosar."
 
-#: 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"
@@ -1150,11 +1185,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"
@@ -1163,25 +1198,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 "_Este � o enderezo 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
@@ -1189,49 +1224,49 @@ msgstr ""
 msgid "_Add"
 msgstr "_Engadir"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_Engadir"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Engadir acci�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Engadir 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
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Amosar"
 
-#: 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
@@ -1241,103 +1276,103 @@ msgstr ""
 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
 #, 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 "_Opci�ns"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Opci�ns por defecto"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Conta"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "editor-de-contactos"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Desconectando 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 "Xeral"
 
-#: 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 "Buscar M_ensaxe..."
@@ -1354,8 +1389,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"
@@ -1388,11 +1423,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
-#: 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 "Seleccionar Contactos do Libro de Enderezos"
 
-#: 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 "Buscar un contacto"
@@ -1470,7 +1505,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"
 
@@ -1532,13 +1567,13 @@ msgstr "Quere recibir correo en _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c: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"
 
@@ -1567,1029 +1602,1029 @@ msgstr "Imprimir Axenda"
 msgid "_Web page address:"
 msgstr "Enderezo da p�xina _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 "Alxeria"
 
-#: 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 "Anguila"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "Ant�rtida"
 
-#: 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 "Antiga e 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 "Arxentina"
 
-#: 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 "Acerbaix�n"
 
-#: 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 "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�lxica"
 
-#: 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 "Belice"
 
-#: 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 "But�n"
 
-#: 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 e Hercegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Botsuana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "Illa 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 do 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 "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 "Camboia"
 
-#: 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 "Illas Caym�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 Centroafricana"
 
-#: 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 "Illa 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 "Illas 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 "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 "Illas 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 Marf�n"
 
-#: 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 "Xibut�"
 
-#: 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 "Exipto"
 
-#: 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 "O 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 "Illas Falkland (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 "Illas 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 "G�iana 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 Franceses do Sul"
 
-#: 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 "Xeorxia"
 
-#: 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 "Alema�a"
 
-#: 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 "Xibraltar"
 
-#: 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 "Grenlandia"
 
-#: 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 "G�iana"
 
-#: 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 "Illas Heard e 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 "Santa S�"
 
-#: 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 "Xamaica"
 
-#: 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 "Xap�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 "Xordania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazakhst�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Quenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "Quiribati"
 
-#: 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 de Corea"
 
-#: 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 "Kuvait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kirgizst�n"
 
-#: 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 "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 "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 "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 "Macau"
 
-#: 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 "Malaui"
 
-#: 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 "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 "Illas 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 "Maiote"
 
-#: 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
 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 "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 "Marrocos"
 
-#: 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 "Naur�"
 
-#: 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 "Pa�ses Baixos"
 
-#: 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 "Nova 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 "Nova Celandia"
 
-#: 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�xer"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nixeria"
 
-#: 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 "Illa 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 "Illas Marianas do Norte"
 
-#: 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 "Paquist�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
 #, fuzzy
 msgid "Palestinian Territory"
 msgstr "Territorios Brit�nicos do Oc�ano �ndico"
 
-#: 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 "Pap�a Nova 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 "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 "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 "Porto 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 "Xuntanza"
 
-#: 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 "Roman�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 "Santo Cristobo e 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 Luc�a"
 
-#: 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 "San Vicente e Granadinas"
 
-#: 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 "San Tom� e 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 "Seichelles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "Serra Leoa"
 
-#: 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 "Illas 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 "Xeorxia do Sul e Illas Sandwich do Sul"
 
-#: 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 "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 "St. Pierre e Miquel�n"
 
-#: 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 "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 "Illas Svalbard e 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 "Su�za"
 
-#: 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 "Taiw�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tajikist�n"
 
-#: 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 "Rep�blica Unida de Tanzania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: 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 "Toquelau"
 
-#: 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 e Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunicia"
 
-#: 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 "Turkmenist�n"
 
-#: 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 "Illas Turk e 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 "Ucra�na"
 
-#: 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 "Illas Exteriores Menores dos EEUU"
 
-#: 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 "Uzbekist�n"
 
-#: 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 "Viet Nam"
 
-#: 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 "Illas Virxes"
 
-#: 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 "Illas Virxes"
 
-#: 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 "Illas Wallis e 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 "Iemen"
 
-#: 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 "Iugoslavia"
 
-#: 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 "Cimbabue"
 
@@ -2628,20 +2663,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Non se puido atopa-lo control dun campo: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
 
-#: 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 Completo"
 
-#: 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 "Nome 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"
 
@@ -2664,6 +2699,19 @@ msgstr ""
 "%s xa existe\n"
 "�Quere sobrescribilo?"
 
+#: addressbook/gui/contact-editor/file-exists.glade.h:1
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:2
+msgid "Don't bother translating this string.  It's not used."
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#, fuzzy
+msgid "Overwrite"
+msgstr "�Sobrescribir ficheiro?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Enderezo _2:"
@@ -2795,7 +2843,7 @@ msgstr "editor-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
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Gardar como VCard"
@@ -2846,7 +2894,7 @@ msgstr ""
 "cartafol.  �Gostar�alle engadilo de todas maneiras?"
 
 #: 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 "Busca Avanzada"
 
@@ -2855,25 +2903,25 @@ msgstr "Busca 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 "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Erro ao iniciar %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"
@@ -2885,10 +2933,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 "Erro desco�ecido"
 
@@ -2896,7 +2944,7 @@ msgstr "Erro desco�ecido"
 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"
@@ -2917,8 +2965,8 @@ msgstr "Protocolo non soportado"
 #: 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 "Cancelada"
 
@@ -2969,7 +3017,7 @@ msgstr "Erro ao elimina-la lista"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Erro ao elimina-la tarxeta"
 
@@ -2986,9 +3034,8 @@ msgstr "Amosar"
 #: 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
@@ -3078,7 +3125,7 @@ msgstr "Libro de Enderezos"
 
 #: 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 "Gardar como VCard"
@@ -3164,7 +3211,7 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Pegar"
 
-#: 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
@@ -3172,8 +3219,8 @@ msgstr "Pegar"
 msgid "Delete"
 msgstr "Eliminar"
 
-#: 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"
@@ -3182,7 +3229,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 ""
 
@@ -3190,11 +3237,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"
@@ -3330,7 +3377,7 @@ msgid "Include:"
 msgstr "Inclu�r:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Horizontal"
 
@@ -3355,7 +3402,7 @@ msgid "Options"
 msgstr "Opci�ns"
 
 #: 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"
 
@@ -3378,7 +3425,7 @@ msgstr "Orixe do 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"
 
@@ -3441,20 +3488,20 @@ msgstr "_Editar 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"
 
@@ -3465,13 +3512,17 @@ msgstr "Baixa"
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: 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 "Erro ao se comunicar co servidor de axenda"
 
-#: 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 "Non foi posible ler o bloque de aplicaci�n da Axenda do pilot"
 
@@ -3588,11 +3639,11 @@ msgstr "Tempo de adiamento (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 "Non hai unha descrici�n dispo�ible."
 
-#: 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"
@@ -3600,13 +3651,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 "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 "
@@ -3617,16 +3668,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 "Non preguntar de novo"
 
-#: 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 "Non foi posible 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 "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
 
@@ -3675,7 +3726,7 @@ msgstr "%d de %B de %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 ""
@@ -3754,9 +3805,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
@@ -3773,13 +3824,13 @@ msgid "Assigned"
 msgstr "Asignada"
 
 #: 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 "Non"
 
@@ -3799,82 +3850,102 @@ 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 "Axenda"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Cartafol que cont�n citas e eventos"
 
-#: calendar/gui/component-factory.c: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 "Imprimir Axenda"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Cartafol que cont�n citas e eventos"
+
+#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
+#: calendar/importers/icalendar-importer.c:704
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Cartafol que cont�n elementos para-facer"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Imprimir tarxetas"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Cartafol que cont�n elementos para-facer"
+
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cita"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Configuraci�n da Fonte de Novas"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: 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 C_ita"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita"
@@ -3917,27 +3988,27 @@ msgid "Alarm Repeat"
 msgstr "Repetici�n da Alarma"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid ""
+"Evolution does not yet support email notification for reminders.  You will "
+"not be able to edit the options for this reminder."
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Mensaxe a Amosar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Tocar un son:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Repetir a alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Executar un 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 "Con estes argumentos:"
@@ -3961,111 +4032,111 @@ 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 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 "Amosar unha mensaxe"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Enviar unha mensaxe"
 
-#: 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 "Executar un programa"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 #, fuzzy
 msgid "Unknown action to be performed"
 msgstr "Treboada desco�ecida"
 
-#: 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 "antes do comezo da 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 "antes do comezo da 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 "antes do comezo da 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 "antes do comezo da 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 "despois da fin da 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 "despois da fin da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "Servidor %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 ""
@@ -4086,7 +4157,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 "Resumo:"
 
@@ -4169,7 +4240,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 "Venres"
 
@@ -4182,7 +4253,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 "Luns"
 
@@ -4192,7 +4263,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: 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"
 
@@ -4205,7 +4276,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Amosa-los _n�meros das semanas no navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4224,7 +4295,7 @@ msgid "Task List"
 msgstr "Lista de _Tarefas"
 
 #: 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 "Xoves"
 
@@ -4241,7 +4312,7 @@ msgid "Time format:"
 msgstr "Formato da 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 "Martes"
 
@@ -4250,7 +4321,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 "M�rcores"
 
@@ -4474,8 +4545,8 @@ msgid "No summary"
 msgstr "Sen resumo"
 
 #: 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 "Gardar como..."
 
@@ -4544,28 +4615,28 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir 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 "Recorrencia"
 
-#: 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 "_Programar Xuntanza"
 
-#: 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 "Xuntanza"
 
@@ -4637,20 +4708,20 @@ msgstr "Hora de _finalizaci�n:"
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Debe estabrecerse un organizador."
 
-#: 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 "�Esa persoa xa asiste � xuntanza!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
@@ -4690,7 +4761,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: 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"
@@ -4702,7 +4773,7 @@ msgstr "Papel"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4778,48 +4849,48 @@ msgstr " "
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita cont�n recorrencias que Evolution non pode editar."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "o"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "Br�tema"
 
-#: 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 "Outro"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "Norte"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "Br�tema"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Outro 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 "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "ocorrencias"
 
@@ -4913,7 +4984,7 @@ msgstr "Data Completada:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c: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 "Precisa dunha Acci�n"
 
@@ -4922,7 +4993,7 @@ msgid "Progress"
 msgstr "En 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:"
 
@@ -4934,17 +5005,17 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: 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:"
@@ -5014,13 +5085,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 "Elimina-los contactos seleccionados"
 
-#: 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"
@@ -5030,30 +5101,30 @@ msgstr "_Abrir"
 msgid "_Save as..."
 msgstr "Gardar 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 "_Imprimir..."
 
-#: 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_rtar"
 
-#: 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"
@@ -5082,12 +5153,12 @@ msgstr "_Marca-las Tarefas como Completas"
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas 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 ""
 
-#: 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 "Prema para engadir unha tarefa"
@@ -5096,8 +5167,8 @@ msgstr "Prema para engadir unha tarefa"
 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"
 
@@ -5126,7 +5197,7 @@ msgid "Start Date"
 msgstr "Data de _Inicio:"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Resumo"
@@ -5193,126 +5264,126 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Nova C_ita"
 
-#: 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 "Novo _Evento de D�a Completo"
 
-#: 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 "Xuntanza"
 
-#: 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 "Nova Tarefa"
 
-#: 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 _Hoxe"
 
-#: 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 � 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
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Informaci�n de Libre/Ocupado"
 
-#: 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 "_Configurar Cartafol..."
 
-#: 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 Cartafol..."
 
-#: 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 "Gardar _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 "_Programar Xuntanza"
 
-#: 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 "Remitir 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 "Facer esta Ocorrencia _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 _Ocorrencia"
 
-#: 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 _T�dalas Ocorrencias"
 
-#: 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 "Erro ao executar o filtro: %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 "Hora do _final da reuni�n:"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completada "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Descrici�n:</b> %s"
 
-#: 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 "informaci�n de axenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Axenda"
 
-#: 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 "un remitente desco�ecido"
 
 #. 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."
@@ -5320,341 +5391,347 @@ msgstr ""
 "<br> Por favor, olle a seguinte informaci�n, e escolla unha acci�n do men� "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Localizaci�n Xeogr�fica: "
 
-#: 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 " Tentativa "
 
-#: 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 "Rexeitado"
 
-#: 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 "Desco�ecido"
 
-#: 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 "Escolla unha Acci�n"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 #, fuzzy
 msgid "Update"
 msgstr "Actualizaci�n de Tarefa"
 
-#: 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
 #, fuzzy
 msgid "Accept"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 #, fuzzy
 msgid "Decline"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: 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 "Informaci�n da Tarefa"
 
-#: 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> publicou informaci�n sobre unha reuni�n."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Informaci�n da Xuntanza"
 
-#: 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> require a s�a presencia nunha reuni�n."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: 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> desexa asistir a unha reuni�n existente."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Actualizaci�n da Xuntanza"
 
-#: 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> desexa recibir a �ltima informaci�n sobre a reuni�n."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualizaci�n de Xuntanza"
 
-#: 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> respostou a unha petici�n de xuntanza."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: 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> cancelou unha reuni�n."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Cancelaci�n da Xuntanza"
 
-#: 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> enviou unha mensaxe inintelixible."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: 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> publicou informaci�n sobre tarefa."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Informaci�n da Tarefa"
 
-#: 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> require que se encargue dunha tarefa."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: 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> desexa asistir a unha tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Actualizaci�n de Tarefa"
 
-#: 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> desexa recibir a �ltima informaci�n sobre a tarefa."
 
-#: 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 Tarefa"
 
-#: 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> respostou a unha asignaci�n de tarefa."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Resposta � Tarefa"
 
-#: 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> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Cancelaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: 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> publicou informaci�n de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: 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> require a s�a informaci�n libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Petici�n de Libre/Ocupado"
 
-#: 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> respostou a unha petici�n de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: 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 "O cartafol parece estar corrompido sen recuperaci�n posible."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: 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
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-#: calendar/gui/e-itip-control.c: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 "�Non se puido envia-lo elemento!\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 "Non foi posible abrir o cartafol 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
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "�Non se puido envia-lo elemento!\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 "Non foi posible abrir o cartafol en `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Eliminaci�n Completa"
 
-#: 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 "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccionar Cartafol"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccionar Cartafol"
@@ -5700,7 +5777,7 @@ msgstr "data-comezo"
 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 Requiridos"
 
@@ -5714,52 +5791,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 "Cuarto"
 
 #: 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 "Presidencia"
 
 #: 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 Requiridos"
 
 #: 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 "Participante 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 "Non-Participante"
 
 #: 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"
 
@@ -5849,43 +5926,50 @@ msgstr "Hora do _inicio da reuni�n:"
 msgid "Meeting _end time:"
 msgstr "Hora do _final da 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
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo armacenamento %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 "Non foi posible cargar as tarefas 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 "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: 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 "Non foi posible abrir o cartafol 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 "Erro ao iniciar %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
@@ -5899,7 +5983,13 @@ msgstr "Non foi posible abrir o cartafol en `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: 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"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5907,7 +5997,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"
@@ -5915,12 +6005,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 "Abrir axenda"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Abrindo cartafol %s"
@@ -5981,54 +6071,64 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: 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 "Debe estabrecerse un organizador."
 
-#: 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
 #, fuzzy
 msgid "Event information"
 msgstr "informaci�n de axenda"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "Informaci�n da Tarefa"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "Informaci�n Opcional"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 msgid "Calendar information"
 msgstr "informaci�n de axenda"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Actualizaci�n de Tarefa"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Actualizar 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
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Informaci�n de Libre/Ocupado"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "informaci�n de axenda"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6269,7 +6369,7 @@ msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
 #: 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 "Previsualizaci�n da Impresi�n"
@@ -6294,7 +6394,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
 
-#: 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 "
@@ -6307,12 +6407,12 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: 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 "Non preguntar de novo"
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimir tarxetas"
@@ -6386,17 +6486,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Non foi posible conectarse � servidor: %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
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6405,84 +6505,84 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Axenda"
 
-#: 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 o argumento 1 sexa unha cadea"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "o argumento 1 de make-time debe ser unha cadea data/hora ISO 8601"
 
-#: 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 o argumento 1 sexa un 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 o argumento 2 sexa un enteiro"
 
-#: 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 o argumento 1 sexa un 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 o argumento 1 sexa un 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 o argumento 1 sexa un 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 o argumento 2 sexa un 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 o argumento 1 sexa unha cadea"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que o argumento 2 sexa unha cadea"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6490,11 +6590,11 @@ msgstr ""
 "contains? espera que o argumento 1 sexa un de \"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 polo 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)"
@@ -6502,24 +6602,29 @@ msgstr ""
 "has-categories? espera que t�dolos argumentos sexan cadeas ou un e s� un "
 "argumento sexa un falso booleano (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin espera que o argumento 1 sexa un 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 "A avaliaci�n da expresi�n de b�squeda non produce un valor booleano"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Outro erro"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8217,82 +8322,82 @@ msgstr "Creando o cartafol %s"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando conectado para completar esta operaci�n"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: 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 "Erro ao analizar o 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 "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: 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 "Fallo na mensaxe %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 cartafol"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %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 "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentos non v�lidos"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentos non v�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 "Non se puido descodifica-la mensaxe."
 
-#: 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 "Non se puido descodifica-la mensaxe."
 
-#: 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 "Erro ao executar a busca por filtro: %s: %s"
@@ -8343,12 +8448,12 @@ msgstr ""
 "Erro ao executar a expresi�n de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copiando as mensaxes"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Copiando as mensaxes a %s"
@@ -8672,7 +8777,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 "Mala resposta de autenticaci�n do servidor."
 
@@ -8729,52 +8834,52 @@ msgstr "Autorizaci�n POP antes de SMTP usando unha fonte non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilaci�n da 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 "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "O URL '%s' necesita unha parte co nome de m�quina"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte coa ruta"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %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 "Fallo na b�squeda do nome: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo desco�ecido"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo desco�ecido"
@@ -8975,7 +9080,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"
@@ -8984,11 +9089,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 ""
 
@@ -9010,7 +9115,7 @@ msgstr ""
 "�Desexa aceptar de todas maneiras?"
 
 #. 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"
@@ -9069,68 +9174,76 @@ msgstr "Non foi posible renomear o cartafol: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: camel/providers/imap/camel-imap-command.c: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
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
 
-#: 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 do servidor IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do 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 "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor rematou cedo de m�is."
 
-#: 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 "A resposta do servidor IMAP non conti�a informaci�n sobre %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 positiva inesperada do 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 "Non foi posible crear o 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 "Non foi posible carga-lo resumo 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 "O cartafol foi destruido e rexenerado no servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
-#: 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 "Non se puido descodifica-la mensaxe."
 
-#: 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
@@ -9146,28 +9259,24 @@ msgstr ""
 "Non � posible obter a mensaxe: %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 "Non existe a mensaxe"
 
-#: 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 "Esta mensaxe non est� dispo�ible 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 "Recollendo informaci�n de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Buscando mensaxes novas"
-
-#: 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 "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -9184,6 +9293,11 @@ msgstr "Non foi posible abrir o directorio de cach�: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
@@ -9231,77 +9345,72 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opci�n conectarase � servidor IMAP usando un contrasinal sen cifrar."
 
-#: 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 de 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 "Servicio %s 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 "Non foi posible conectarse a %s (porto %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 ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %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 non soportada"
 
-#: 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 "A autenticaci�n fallou."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "O cartafol `%s' non existe."
-
-#: 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 "O servidor IMAP %s non soporta o tipo de autenticaci�n %s solicitado."
 
-#: 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 "Non hai soporte para o tipo de autenticaci�n %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 "%sIntroduza o contrasinal 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 "Non introduciu un contrasinal."
 
-#: 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"
@@ -9312,24 +9421,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 "Non existe o cartafol %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 "O nome do cartafol non pode conter o car�cter 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 "Erro desco�ecido: %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 "Non se lle permite ao cartafol pai conter subcartafoles"
 
@@ -9409,8 +9518,8 @@ msgstr ""
 "Para ler e armacenar correo local en ficheiros spool est�ndar de tipo mbox."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c: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 "A ra�z de almacenamento %s non � unha ruta absoluta"
@@ -9422,7 +9531,7 @@ msgstr "O ra�z de armacenamento %s non � un directorio normal."
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non � posible obter o cartafol: %s: %s"
@@ -9436,32 +9545,32 @@ msgstr "Os armacenamentos locais non te�en un inbox"
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %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 "Non foi posible renomear o cartafol %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 "Non foi posible renomear o cartafol: %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 "Non foi posible borrar o ficheiro de resumo de cartafol `%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 "Non foi posible borrar o ficheiro de �ndice de cartafol `%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 "Non foi posible carga-lo resumo de %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 "Incapaz de engadir a mensaxe ao resumo: motivo desco�ecido"
 
@@ -9482,6 +9591,7 @@ msgstr "Contido da mensaxe non v�lido"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9493,12 +9603,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 "O cartafol `%s' non existe."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9524,7 +9636,8 @@ msgid "not a maildir directory"
 msgstr "non � un directorio maildir."
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c: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 "Non foi posible examina-lo cartafol `%s': %s"
@@ -9555,7 +9668,7 @@ msgid "Storing folder"
 msgstr "Sincronizando cartafol"
 
 #: 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 "Non se pode crear bloqueo de cartafol en %s: %s"
@@ -9731,40 +9844,45 @@ msgstr "`%s' non � un directorio."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Non foi posible abrir a ruta do directorio MH: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "O ra�z de armacenamento %s non � un directorio normal."
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "O cartafol `%s/%s' non 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' non � un ficheiro 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 "Ficheiro spool 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 "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Os cartafoles spool non se poden eliminar"
 
@@ -9857,50 +9975,50 @@ msgstr "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 "Recibindo o resumo de 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 "Operaci�n cancelada"
 
-#: 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 "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Eliminando as mensaxes borradas"
 
-#: 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 "Non existe a mensaxe con UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe 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 ""
 "Non � posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitaci�n desco�ecida"
@@ -10180,45 +10298,45 @@ msgstr "Fallo temporal de autenticaci�n"
 msgid "Authentication required"
 msgstr "Autenticaci�n requirida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Erro na resposta 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 ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %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 "O cartafol parece estar corrompido sen recuperaci�n posible."
 
-#: 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 "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Erro na resposta 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 "O servidor SMTP %s non soporta o tipo de autenticaci�n %s requirida"
 
-#: 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 "%sIntroduza o contrasinal 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"
@@ -10229,90 +10347,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 de 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 "Entrega 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 "Non se pode enviar a mensaxe: enderezo do autor non v�lido"
 
-#: 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 a mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Non se pode enviar a mensaxe: non se definiron 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 "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "Sa�do 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 "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Erro na resposta 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 "Erro ao crear o obxecto 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 "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "A petici�n AUTH fallou."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticaci�n do 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 "A petici�n MAIL FROM expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Erro na resposta MAIL FROM: %s: correo non 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 "A petici�n RCPT TO expirou: %s: correo non 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 "A petici�n DATA expirou: %s: correo non enviado"
@@ -10320,80 +10438,71 @@ msgstr "A petici�n DATA expirou: %s: correo non enviado"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "Erro na resposta 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 "O env�o de DATA expirou: remate da mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Mala resposta de autenticaci�n do 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 "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "Erro na resposta 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 "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Erro na resposta 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 "anexo"
 
-#: 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 "Eliminar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Anexar un ficheiro � mensaxe"
 
@@ -10425,7 +10534,7 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Prema aqu� para o libro de enderezos"
 
@@ -10436,45 +10545,45 @@ msgstr "Prema aqu� para o libro de enderezos"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 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:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: 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 "Introduza os enderezos que recibir�n unha copia da mensaxe"
 
-#: 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."
@@ -10485,12 +10594,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 "descrici�n"
@@ -10505,7 +10614,7 @@ msgstr "Anexar un ficheiro"
 msgid "Could not create a PGP signature context"
 msgstr "Non foi posible crear un contexto de sinatura PGP."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10514,34 +10623,34 @@ msgstr ""
 "Erro ao le-lo ficheiro %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 "O ficheiro existe, �sobrescribir?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10550,7 +10659,7 @@ msgstr ""
 "Non � posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10559,7 +10668,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10568,7 +10677,7 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -10577,35 +10686,57 @@ msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesi�n anterior.\n"
 "�Gostar�alle probar a recuperalos?"
 
-#: 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 ""
+"Esta mensaxe non foi enviada.\n"
+"\n"
+"�Desexa gardar os cambios?"
+
+#: composer/e-msg-composer.c:1536
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Gravar sinatura"
 
-#: 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 "Compo�er unha mensaxe"
 
-#: 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 ""
+"Non foi posible crear a fiestra do compositor, porque a�nda\n"
+"non configurou ningunha identidade no compo�ente de correo."
+
+#: composer/e-msg-composer.c:2879
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10614,13 +10745,13 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque a�nda\n"
 "non configurou ningunha identidade no compo�ente de correo."
 
-#: composer/e-msg-composer.c: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."
@@ -10628,8 +10759,9 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque a�nda\n"
 "non configurou ningunha identidade no compo�ente de correo."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Non foi posible inicializar o compositor de Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10681,8 +10813,8 @@ msgstr "O asunto cont�n"
 msgid "Subject does not contain"
 msgstr "O asunto non cont�n"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c: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?"
@@ -10840,7 +10972,7 @@ msgstr "anos"
 
 #: filter/filter-datespec.c:174
 #, fuzzy
-msgid "You have forgotten to choose a date."
+msgid "You must choose a date."
 msgstr "Oops. Esqueceu escoller unha data."
 
 #: filter/filter-datespec.c:269
@@ -10898,15 +11030,11 @@ msgstr "Engadir acci�n"
 
 #: filter/filter-folder.c:149
 #, fuzzy
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Oops, esqueceu escoller un cartafol.\n"
-"Volva atr�s e especifique un cartafol v�lido no que deixar o correo."
+msgid "You must specify a folder.\n"
+msgstr "Nome do 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 Cartafol"
 
@@ -10919,7 +11047,7 @@ msgstr ""
 "Erro na 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"
@@ -11108,227 +11236,231 @@ msgid "Beep"
 msgstr "Belice"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "cont�n"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar � Cartafol"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data de recepci�n"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data de env�o"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "non cont�n"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "non remata en"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "non soa como"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "non comeza por"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Non Existe"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "remata en"
-
-#: 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 "Expresi�n"
 
-#: 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 "foi posterior a"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "foi anterior a"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "Marcada"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "� maior que"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "� menor que"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "non �"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Marcada"
-
-#: 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 "Lista de Correo"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Mover a un Cartafol"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar 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 "Ler"
 
-#: 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 "Busca por 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 "Ocupado"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "� maior que"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "� 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 "Autor"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Compa��a"
 
-#: 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 "soa como"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Conta Fonte"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Cabeceira espec�fica"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "comeza por"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: 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
 #, fuzzy
 msgid "Unset Status"
 msgstr "Establecer Estado"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "cont�n"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "non cont�n"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "non remata en"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "non existe"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "non existe"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "non soa como"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "non comeza por"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "remata en"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "Marcada"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "foi posterior a"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "foi anterior a"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "� maior que"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "� menor que"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Marcada"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "non �"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "�"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "� maior que"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "� menor que"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Ocupado"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "soa como"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "comeza por"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regras"
@@ -11364,31 +11496,31 @@ msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution est� importando o seu correo de Elm antigo"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c: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 "Agarde, por favor"
 
-#: 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 coma %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 "Examinando %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"
 
@@ -11449,39 +11581,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 os datos antigos 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 "Lixo"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Ficheiro local de correo %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 "Explorando o directorio"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Comezando a importaci�n"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Opci�ns"
 
-#: 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?"
@@ -11603,105 +11735,116 @@ msgid "Folder containing mail"
 msgstr "Cartafol que cont�n 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 "Cartafol que cont�n correo"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Lixo Virtual"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Cartafol de Lixo Virtual"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Este cartafol non pode conter mensaxes."
 
-#: 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 "Modificar as propiedades deste cartafol"
 
-#: 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 "Non definiu ning�n m�todo de env�o de 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
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Mensaxe Remitida"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compo�er unha mensaxe"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Seguinte Mensaxe"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Anterior Mensaxe"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nova Mensaxe de Correo"
 
-#: 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 "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando ao servidor..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o armacenamento co shell"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades de \"%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 "Non foi posible crear o directorio temporal: %s"
@@ -11746,140 +11889,140 @@ msgstr "%d sen 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 Cartafol _Virtual Dende Mensaxe"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: 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 pola Lista de _Correo"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: 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 "_Responder � Autor"
 
-#: 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 "Responder � _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 "Responder a _Todos"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: 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 "Completada"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. 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 "Marcar como _Lida"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non 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 � Cartafol.."
 
-#: 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 un Cartafol..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "CartafolV pola Lista de Correo"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar pola 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 "CartafolV pola Lista de Correo (%s)"
@@ -11954,20 +12097,20 @@ msgstr "Non encheu toda a informaci�n requirida."
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas 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
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome 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 "_Ruta:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear d�as contas co mesmo nome"
 
@@ -11984,14 +12127,14 @@ msgid "Really delete account?"
 msgstr "�Borrar esta conta de verdade?"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c: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 "Desactivar"
 
 #: 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 "Activado"
 
@@ -12077,8 +12220,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
@@ -12120,7 +12263,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
 
-#: mail/mail-callbacks.c: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?"
@@ -12128,28 +12271,28 @@ msgstr ""
 "Incapaz de abrir o cartafol de borradores para esta conta.\n"
 "�Gostar�alle usar o cartafol de borradores por defecto?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "un remitente desco�ecido"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "O %a, %Y-%m-%d �s %H:%M, %%s escribiu:"
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(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 mensaxe(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 "�Est� seguro de que quere editar todas as %d mensaxes?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12157,7 +12300,7 @@ msgstr ""
 "S� pode editar mensaxes gardadas\n"
 "no cartafol de Borradores."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12165,39 +12308,39 @@ msgstr ""
 "S� pode reenviar mensaxes\n"
 "do cartafol de Enviadas."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�Est� seguro de que quere re-enviar as %d mensaxes?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "�Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Amosa-la seguinte mensaxe sen ler"
 
-#: 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"
@@ -12209,7 +12352,7 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12218,65 +12361,65 @@ msgstr ""
 "Erro ao cargar a informaci�n do 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 "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: 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 "A impresi�n da mensaxe fallou"
 
-#: 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 ""
 "�Est� seguro de que quere abrir todas as %d mensaxes en fiestras 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
 #, fuzzy
 msgid " [script]"
 msgstr "descrici�n"
 
-#: 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 "Contacto Sen Nome"
 
-#: 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 "Engadir criterio"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Gravar sinatura"
@@ -12338,16 +12481,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Conta"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Comprobando 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 ao servidor..."
 
@@ -13078,78 +13221,74 @@ msgstr "Non foi posible crear un contexto de sobre S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear un contexto de descodificaci�n S/MIME."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: 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 Inline (mediante %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Cargar _Imaxes"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tarefas _retrasadas:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "O %d de %B �s %k:%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 "Abrir Ligaz�n no Navegador"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Copiar Localizaci�n da Ligaz�n"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Gardar Ligaz�n coma (AM��AME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Gardar Imaxe coma..."
 
@@ -13158,112 +13297,113 @@ msgstr "Gardar Imaxe coma..."
 msgid "Pinging %s"
 msgstr "Examinando %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: 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 "Enderezo Incorrecto"
 
-#: 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 "Para"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 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 ""
 "\n"
 "Cliente de Correo: "
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Non foi posible 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 "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
 
-#: 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 ""
 "Esta mensaxe est� asinada dixitalmente pero non se puido comprobar a s�a "
 "autenticidade"
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro 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 "Punteiro a ficheiro local (%s) v�lido no sitio \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos desco�ecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: 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 "Cartafoles Locais"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Refrescando o cartafol"
 
-#: 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"
@@ -13272,29 +13412,24 @@ msgstr ""
 "Non foi posible garda-la metainformaci�n do cartafol, seguramente\n"
 "non poder� abrir este cartafol outra vez: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" � formato \"%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."
@@ -13302,15 +13437,15 @@ msgstr ""
 "Se non pode abrir m�is esta caixa de correo, poida\n"
 "que te�a que reparala a man."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Non se pode cambia-lo formato dun cartafol non local."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, fuzzy, 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 "Non se pode cambia-lo formato dun cartafol non local."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13553,20 +13688,20 @@ msgstr "Agardando..."
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaci�n."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: 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 "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
@@ -13578,11 +13713,11 @@ msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Gravar sinatura"
 
-#: 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"
@@ -13592,11 +13727,12 @@ msgstr ""
 "\n"
 "�Desexa gardar os 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 "Sinatura _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 "Nome:"
 
@@ -13632,7 +13768,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 "CartafolesV"
 
@@ -13664,67 +13800,67 @@ msgstr "(Sen asunto)"
 msgid "%s - Message"
 msgstr "%s - Mensaxe"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "M�ltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "M�ltiples Mensaxes"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "A m�is baixa"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "M�is baixa"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "M�is alta"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "A m�is 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 "Hoxe �s %k:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Onte �s %k:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "O %A �s %k:%M"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B �s %k:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -13799,45 +13935,71 @@ msgstr "Responder a Todos"
 msgid "Review"
 msgstr "Previsualizar"
 
-#: 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 "Completada"
+
+#: 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 "Limpar"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Pendente "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Nome do ficheiro:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Examinando os cartafoles baixo %s en \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Examinando os cartafoles de nivel ra�z en \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subscrib�ndose ao cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscrib�ndose do cartafol \"%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 "Cartafol"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Gardar no cartafol..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Non se seleccionou ning�n servidor"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
@@ -24816,12 +24978,12 @@ msgstr "%A, %d de %B"
 msgid "No description"
 msgstr "descrici�n"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Resumo 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 "Cartafoles Locais"
 
@@ -24831,23 +24993,23 @@ msgstr "Cartafoles Locais"
 #. (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 "Palabra do D�a de Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Citas do D�a"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Engadir fonte de novas"
 
-#: 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 "Introduza o URL da fonte de novas que desexe engadir"
 
@@ -24888,12 +25050,12 @@ msgstr "Descrici�n:"
 msgid "My Weather"
 msgstr "O Meu Tempo"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Tempo"
 
@@ -26242,6 +26404,11 @@ msgstr ""
 "Non foi posible borrar o cartafol:\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
 #, fuzzy
 msgid "Add a Folder"
@@ -26478,12 +26645,25 @@ msgid "Rename folder"
 msgstr "Renomea-lo cartafol '%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 "O nome de cartafol indicado non � v�lido: %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 ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -26492,12 +26672,12 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\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 un _Novo Cartafol..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nova..."
 
@@ -26527,20 +26707,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 ""
-"Importando %s\n"
-"O importador non est� preparado.\n"
-"Agardando 5 segundos antes de tentalo de novo."
-
-#: 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"
@@ -26549,23 +26716,23 @@ 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 Cartafol"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non 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
 #, 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"
@@ -26574,11 +26741,11 @@ msgstr ""
 "Non hai importador capaz de manexar\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"
@@ -26587,17 +26754,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26606,32 +26773,32 @@ 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 "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Tipo de ficheiro:"
 
-#: 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 "Importar un formato de ficheiro externo"
 
-#: 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"
@@ -26639,24 +26806,24 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuraci�ns 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 "Iniciando os Importadores Intelixentes"
 
-#: 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
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Escolla un cartafol de destino para importar estes 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"
 
@@ -26682,32 +26849,32 @@ msgstr "Sincronizando cartafol"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Sincronizando '%s'"
 
-#: 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 "Abrindo cartafol %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 "Abrindo cartafol %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 "Non foi posible renomear o cartafol: %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 ""
@@ -26753,46 +26920,46 @@ msgstr "Este cartafol non pode conter mensaxes."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' son nomes de cartafol reservados."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Non se atopou o Bug buddy no seu $PATH."
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Acerca de Evolution..."
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Ir � cartafol..."
 
-#: 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 o cartafol a abrir"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Crear un novo atallo"
 
-#: 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 "Escolla o cartafol ao que quere que apunte o atallo:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar 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 "_Traballar 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 "Traballar Desconectado"
 
@@ -26800,27 +26967,27 @@ msgstr "Traballar Desconectado"
 msgid "(No folder displayed)"
 msgstr "(Ning�n cartafol visualizado)"
 
-#: 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
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolucion est� conectado. Prema neste bot�n para desconectar."
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution est� desconect�ndose"
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -26834,12 +27001,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o armacenamento 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"
@@ -26847,19 +27014,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Argumentos non v�lidos"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuraci�ns"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
@@ -26998,59 +27165,63 @@ msgstr "Atallos"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Sen erros"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non � v�lido"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: 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 "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funci�n non implementada neste medio de armacenamento"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operaci�n non soportada"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non est� soportado neste almacenamento"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "O cartafol especificado non se pode modificar ou eliminar"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Non se pode converter un cartafol nun fillo dun dos seus descendentes"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Non se pode crear bloqueo de cartafol en %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 (...)"
@@ -27265,7 +27436,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 ""
@@ -27279,30 +27450,26 @@ msgid "Evolution Import Assistant"
 msgstr "Asistente de Importaci�n de Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Asistente Importador de Evolution"
-
-#: shell/importer/import.glade.h:4
 #, fuzzy
 msgid "Import File (step 3 of 3)"
 msgstr "Importar Ficheiro (Paso 2 de 2)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 #, fuzzy
 msgid "Importer Type (step 1 of 3)"
 msgstr "Importar Ficheiro (Paso 2 de 2)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 #, fuzzy
 msgid "Select Importers (step 2 of 3)"
 msgstr "Seleccionar un Ficheiro (Paso 1 de 2)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 #, fuzzy
 msgid "Select a File (step 2 of 3)"
 msgstr "Seleccionar un Ficheiro (Paso 1 de 2)"
 
-#: 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"
@@ -27539,10 +27706,10 @@ msgstr "a 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 "_Acci�ns"
 
@@ -27661,7 +27828,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 "Gardar"
 
@@ -27688,7 +27855,7 @@ msgstr "Gravar este elemento no disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -27770,7 +27937,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Programar unha xuntanza para este elemento"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Personalizar My Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -27821,29 +27989,30 @@ msgid "Post a message to a Public folder"
 msgstr "Copiar a mensaxe a un novo cartafol"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Subscribirse a Cartafoles..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Amosar a fiestra de previsualizaci�n da mensaxe"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subcribirse ou desuscribirse dos cartafoles en servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de Cartafoles Virtuais..."
 
-#: 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 "_Panel de Previsualizaci�n"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "Subscribirse a Cartafoles..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Cambiar as propiedades deste cartafol"
@@ -27939,7 +28108,7 @@ msgstr "Lista de Mensaxes por F�os"
 msgid "_Expunge"
 msgstr "_Limpar"
 
-#: 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 "_Cartafol"
 
@@ -28256,7 +28425,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
 #: 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 as opci�ns de p�xina para a impresora actual"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -28371,7 +28541,7 @@ msgstr "Citado"
 msgid "_Resend..."
 msgstr "_Renomear..."
 
-#: 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 "_Ferramentas"
 
@@ -28386,12 +28556,12 @@ msgstr "Pechar esta fiestra"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_Pechar"
 
 #: 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"
 
@@ -28567,7 +28737,7 @@ msgstr "HTML"
 msgid "Save the current file and close the window"
 msgstr "Gardar o elemento e pechar a caixa de di�logo"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -28737,7 +28907,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Crear un _Novo Cartafol..."
 
 #: 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
@@ -28754,118 +28924,138 @@ msgid "Pi_lot Settings..."
 msgstr "_Preferencias de Correo..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "_Preferencias de Correo..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Crear un _Novo Cartafol..."
+
+#: ui/evolution.xml.h:29
 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 o correo na cola e recibir o correo novo"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Configuraci�n do Correo"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuraci�n do Correo"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Amosar informaci�n sobre Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Trocar"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mostra da barra de atallos"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Trocar entre traballo conectado e desconectado"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Ver o cartafol seleccionado"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Evolution"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de 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 _Cartafoles"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Cartafol"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Ir � Cartafol..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 #, fuzzy
 msgid "_Import..."
 msgstr "Importando..."
 
-#: 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 "_Novo"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Preferencias das Tarefas..."
+msgid "_Remove Other User's Folder"
+msgstr "Crear un _Novo Cartafol..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: 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 "_Preferencias de Correo..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Atallo"
@@ -29109,11 +29299,11 @@ msgstr "Codificaci�n dos Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Editor de Buscas"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Gardar Busca"
 
@@ -29194,6 +29384,51 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
 #, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "_Eliminar"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Engadir"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Buscando mensaxes novas"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "O cartafol `%s' non existe."
+
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u bytes"
+
+#, fuzzy
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Oops, esqueceu escoller un cartafol.\n"
+#~ "Volva atr�s e especifique un cartafol v�lido no que deixar o correo."
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importando %s\n"
+#~ "O importador non est� preparado.\n"
+#~ "Agardando 5 segundos antes de tentalo de novo."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Asistente Importador de Evolution"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Preferencias das Tarefas..."
+
+#, fuzzy
 #~ msgid "Error in search expression."
 #~ msgstr ""
 #~ "Erro ao executar a expresi�n de busca: %s:\n"
@@ -29247,15 +29482,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "Non-Participantes"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Esta mensaxe non foi enviada.\n"
-#~ "\n"
-#~ "�Desexa gardar os cambios?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (por defecto)"
@@ -29530,14 +29756,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Select a signature script"
 #~ msgstr "Borrar todo ag�s a sinatura"
 
-#, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "Sinatura _HTML:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Nome do ficheiro:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "Sinatura _HTML:"
 
@@ -29570,14 +29788,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Dereita:"
 
 #, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Engadir"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "_Eliminar"
-
-#, fuzzy
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "�Est� seguro de que quere borrar o cartafol '%s'?"
 
@@ -30137,9 +30347,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_Tarefa..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Preferencias de Correo..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Remitir _Anexo"
 
diff --git a/po/hu.po b/po/hu.po
index 82e52416a4..8cb2ebef28 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.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-08-25 23:43+0200\n"
 "Last-Translator: Andras Timar <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -318,11 +318,17 @@ msgstr "Csal�di n�v"
 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 "N�vtelen c�mlista"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "T�bb VK�rtya"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VK�rty�ja"
@@ -333,47 +339,47 @@ msgstr "%s VK�rty�ja"
 #: 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 "A Bonobo inicializ�l�sa nem siker�lt"
 
-#: 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 "Keres�s..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Bet�lt�s..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Kapcsol�d�s az LDAP-kiszolg�l�hoz..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "N�vjegy hozz�ad�sa az LDAP-kiszolg�l�hoz..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "N�vjegy elt�vol�t�sa az LDAP-kiszolg�l�r�l..."
 
-#: 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 "N�vjegy m�dos�t�sa az LDAP-kiszolg�l�n..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "LDAP keres�s eredm�nyeinek let�lt�se..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr "Hiba a keres�s k�zben"
 
@@ -391,13 +397,13 @@ msgid "EBook not loaded\n"
 msgstr "Az EBook nincs bet�ltve\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 "Nem siker�lt elind�tani a wombat kiszolg�l�t"
 
 #: 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 "Nem siker�lt a wombatot elind�tani"
@@ -467,10 +473,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Factory a minta c�mjegyz�k kontrollhoz"
 
 #: 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 "N�vjegyek"
@@ -487,27 +493,37 @@ msgstr "LDAP-kiszolg�l�"
 msgid "LDAP server containing contact information"
 msgstr "N�vjegyeket tartalmaz� LDAP-kiszolg�l�"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "N�vjegyek"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "N�vjegyeket tartalmaz� mappa"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "�j n�vjegy"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_N�vjegy"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Create a new contact"
 msgstr "�j n�vjegy k�sz�t�se"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "�j c�mlista"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "_C�mlista"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 msgid "Create a new contact list"
 msgstr "�j c�mlista k�sz�t�se"
 
@@ -545,7 +561,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "Ez az Evolution-v�ltozat nem t�mogatja az LDAP-t"
 
 #: 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 "A gnome-vfs inicializ�l�sa nem siker�lt"
 
@@ -553,11 +569,11 @@ msgstr "A gnome-vfs inicializ�l�sa nem siker�lt"
 msgid "Other Contacts"
 msgstr "Egy�b c�mt�rak"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Nem siker�lt megnyitni a c�mjegyz�ket"
 
-#: 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."
@@ -565,7 +581,7 @@ msgstr ""
 "Nem siker�lt megnyitni a c�mjegyz�ket. Ellen�rizd, hogy az �tvonal\n"
 "l�tezik-e �s van-e jogod az el�r�s�hez."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -576,7 +592,7 @@ msgstr ""
 "jelenti, hogy helytelen URI-t adt�l meg, vagy az LDAP\n"
 "kiszolg�l� nem m�k�dik."
 
-#: 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"
@@ -588,7 +604,7 @@ msgstr ""
 "a CVS forr�sb�l kell leford�tanod a programot, miut�n let�lt�tted\n"
 "az OpenLDAP-t az al�bbi helyr�l.\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"
@@ -599,37 +615,47 @@ msgstr ""
 "jelenti, hogy helytelen URI-t adt�l meg, vagy az LDAP\n"
 "kiszolg�l� nem m�k�dik."
 
-#: 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 "Nem siker�lt bejelentkezni az IMAP kiszolg�l�ra."
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "�rd be %s jelszav�t (%s felhaszn�l�)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr "N�v kezd�dik"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "N�v kezd�dik"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kateg�ria"
 
 #. 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 "B�rmely mez� tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Halad�..."
 
-#: 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"
@@ -637,7 +663,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"
@@ -645,25 +671,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 "B�rmelyik kateg�ria"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "Az URI amit a Mappab�ng�sz� meg fog nyitni"
 
@@ -730,50 +756,50 @@ msgid "  S_how Supported Bases "
 msgstr "_T�mogatott t�pusok lek�rdez�se"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "<< Kevesebb be�ll�t�s"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "&lt;- _Remove"
-msgstr "&lt;- _T�rl�s"
-
-#: 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
+msgid "<- _Remove"
+msgstr "<- _T�rl�s"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "<< Kevesebb be�ll�t�s"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -907,45 +933,51 @@ msgstr "Egy"
 
 #: 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 "_Alap�rt�kek"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
 msgstr "_Alap�rt�kek"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "S_earch scope: "
 msgstr "Keres�s _hat�k�re: "
 
 #. 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 "Keres�s"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Select"
 msgstr "Kiv�laszt�s"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Selected:"
 msgstr "Kiv�lasztva:"
 
-#: 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"
@@ -956,7 +988,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"
@@ -965,45 +997,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 "1. l�p�s: Kiszolg�l� adatai"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Step 2: Connecting to Server"
 msgstr "2. l�p�s: Kapcsol�d�s a kiszolg�l�hoz"
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr "3. l�p�s: Keres�s a c�mt�rban"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr "4. l�p�s: N�v megjelen�t�se"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Al"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Keres�s t�rol�sa VMappak�nt"
 
-#: 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"
@@ -1011,7 +1043,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"
@@ -1020,7 +1052,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"
@@ -1028,7 +1060,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"
@@ -1038,7 +1070,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"
@@ -1048,27 +1080,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 "
@@ -1078,7 +1110,7 @@ msgstr ""
 "Ez a n�v a postafi�k azonos�t�s�ra szolg�l. Csak a megjelen�t�sben van "
 "szerepe."
 
-#: 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"
@@ -1086,11 +1118,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"
@@ -1099,24 +1131,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 "_SSL/TLS haszn�lata:"
 
-#: 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 "E-mail c�m haszn�lata"
 
-#: 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 "Amikor csak lehets�ges"
 
-#: 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
@@ -1124,43 +1156,43 @@ msgstr "Amikor csak lehets�ges"
 msgid "_Add"
 msgstr "Hozz�_ad�s"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
-msgstr "_Hozz�ad�s -&gt;"
+#: addressbook/gui/component/ldap-config.glade.h:107
+msgid "_Add ->"
+msgstr "Hozz�_ad�s ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 msgid "_Add Mapping"
 msgstr "_Lek�pez�s hozz�ad�sa"
 
-#: 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 "_Mindig"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Delete Mapping"
 msgstr "_Lek�pez�s t�rl�se"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Display name:"
 msgstr "_Megjelen�tend� n�v:"
 
-#: 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 "Ne haszn�lja az SSL/TLS-t"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr "_Let�lt�si korl�t:"
 
-#: 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
@@ -1170,92 +1202,92 @@ msgstr "_Let�lt�si korl�t:"
 msgid "_Edit"
 msgstr "S_zerkeszt�s"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Edit Mapping"
 msgstr "Lek�pez�s _szerkeszt�se"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 msgid "_Evolution attribute:"
 msgstr "_Evolution attrib�tum"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr "_Ha sz�ks�ges "
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr "_LDAP-attrib�tum:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr "_LDAP-attrib�tumok:"
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr "_Bejelentkez�si m�d:"
 
-#: 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 "_T�bb be�ll�t�s >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Port number:"
 msgstr "_Portsz�m:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr "_Alap�rt�kek"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Search base:"
 msgstr "Keres�s _kiindul�pontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Kiszolg�l� neve:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Timeout (minutes):"
 msgstr "_Szundi id� (percek)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "account-druid"
 msgstr "account-druid"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "account-editor"
 msgstr "account-editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "cards"
 msgstr "k�rtya"
 
-#: 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"
 
@@ -1269,8 +1301,8 @@ msgstr "Factory a c�mjegyz�k n�vkiv�laszt� fel�let�hez"
 
 #. 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"
@@ -1301,11 +1333,11 @@ msgstr "(%d nincs megjelen�tve)"
 msgid "Unnamed Contact"
 msgstr "N�vtelen n�vjegy"
 
-#: 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 "N�vjegyek kijel�l�se a c�mjegyz�kb�l"
 
-#: 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 "N�vjegy keres�se"
 
@@ -1376,7 +1408,7 @@ msgid "D_epartment:"
 msgstr "_Oszt�ly:"
 
 #: 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 "R�szletek"
 
@@ -1436,13 +1468,13 @@ msgstr "Tud fogadni _HTML levelet"
 
 #: 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 "_T�rl�s"
 
@@ -1470,1024 +1502,1024 @@ msgstr "_Nyilv�nos napt�r URL:"
 msgid "_Web page address:"
 msgstr "_Weblap c�me:"
 
-#: 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 "Egyes�lt �llamok"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afganiszt�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 "Alb�nia"
 
-#: 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�ria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Amerikai Szamoa"
 
-#: 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 "Antarktisz"
 
-#: 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 �s 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 "Argent�na"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "�rm�nyorsz�g"
 
-#: 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 "Ausztr�lia"
 
-#: 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 "Ausztria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbajdzs�n"
 
-#: 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 "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Banglades"
 
-#: 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 "Feh�roroszorsz�g"
 
-#: 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 "Belgium"
 
-#: 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 "Bol�via"
 
-#: 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 "Bosznia-Hercegovina"
 
-#: 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 Island"
 
-#: 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 "Braz�lia"
 
-#: 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 "Brit Indiai �ce�ni Ter�let"
 
-#: 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 "Bulg�ria"
 
-#: 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 "Kambodzsa"
 
-#: 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 "Z�ldfoki-szigetek"
 
-#: 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 "Kajm�n-szigetek"
 
-#: 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 "K�z�p-afrikai K�zt�rsas�g"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Cs�d"
 
-#: 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 "K�na"
 
-#: 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 "Kar�csony-szigetek"
 
-#: 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) Islands"
 
-#: 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 "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 "Kong�"
 
-#: 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 Islands"
 
-#: 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 "Elef�ntcsontpart"
 
-#: 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 "Horv�torsz�g"
 
-#: 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 "Ciprus"
 
-#: 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 "Csehorsz�g"
 
-#: 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�nia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Dzsibuti"
 
-#: 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 "Dominikai K�zt�rsas�g"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Kelet-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 "Egyiptom"
 
-#: 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 "Egyenl�t�i 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 "�sztorsz�g"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Eti�pia"
 
-#: 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-szigetek"
 
-#: 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 Islands"
 
-#: 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 "Finnorsz�g"
 
-#: 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 "Franciaorsz�g"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Francia 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 "Francia Polon�zia"
 
-#: 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 "Francia D�li Ter�letek"
 
-#: 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 "Gr�zia"
 
-#: 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 "N�metorsz�g"
 
-#: 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 "Gibralt�r"
 
-#: 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 "G�r�gorsz�g"
 
-#: 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 And McDonald Islands"
 
-#: 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 "Magyarorsz�g"
 
-#: 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 "Izland"
 
-#: 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 "Indon�zia"
 
-#: 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 "�rorsz�g"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Izrael"
 
-#: 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 "Olaszorsz�g"
 
-#: 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 "Jord�nia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazahszt�n"
 
-#: 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 "Koreai K�zt�rsas�g"
 
-#: 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 "Kirgiziszt�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laosz"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Lettorsz�g"
 
-#: 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 "Litv�nia"
 
-#: 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 "Maced�nia"
 
-#: 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 "Malaysia"
 
-#: 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 "M�lta"
 
-#: 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-szigetek"
 
-#: 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 "Mauritania"
 
-#: 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 "Mexik�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Mikron�zia"
 
-#: 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 "Moldovai K�zt�rsas�g"
 
-#: 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 "Mong�lia"
 
-#: 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 "Marokk�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: 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 "Nam�bia"
 
-#: 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 "Nep�l"
 
-#: 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 "Hollandia"
 
-#: 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�k"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "�j-Kaled�nia"
 
-#: 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 "�j-Z�land"
 
-#: 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 "Norfolk-sziget"
 
-#: 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 "�szaki Mariana-szigetek"
 
-#: 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�gia"
 
-#: 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 "Pakiszt�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 "Palesztin Ter�let"
 
-#: 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 "P�pua �j-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 "F�l�p-szigetek"
 
-#: 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 "Lengyelorsz�g"
 
-#: 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 "Portug�lia"
 
-#: 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 "Rom�nia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Orosz F�der�ci�"
 
-#: 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 And 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 And The Grenadines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "Szamoa"
 
-#: 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 And 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 "Sza�d Ar�bia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Szeneg�l"
 
-#: 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 "Szingap�r"
 
-#: 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 "Szlov�kia"
 
-#: 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 "Szlov�nia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Salamon-szigetek"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Szom�lia"
 
-#: 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 "D�l-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 "South Georgia And The South Sandwich Islands"
 
-#: 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 "Spanyolorsz�g"
 
-#: 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 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 "Szud�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 "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 "Svalbard And Jan Mayen Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Szv�zif�ld"
 
-#: 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 "Sv�dorsz�g"
 
-#: 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 "Sv�jc"
 
-#: 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 "Tajvan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "T�dzsikiszt�n"
 
-#: 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 "Tanz�nia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Thaif�ld"
 
-#: 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 �s Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tun�zia"
 
-#: 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�r�korsz�g"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "T�rkmeniszt�n"
 
-#: 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 And Caicos Islands"
 
-#: 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 "Ukrajna"
 
-#: 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 "Egyes�lt Arab Emir�tusok"
 
-#: 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 "Egyes�lt Kir�lys�g"
 
-#: 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 "�zbegiszt�n"
 
-#: 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 "Virgin-szigetek, Brit"
 
-#: 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 "Virgin-szigetek, 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 "Wallis And Futuna Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Nyugat-Szahara"
 
-#: 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 "Jugoszl�via"
 
-#: 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"
 
@@ -2524,20 +2556,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nem tal�lhat� widget a mez�h�z: `%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 "Gyors n�vjegyhozz�ad�s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "R�szletes szerkeszt�s"
 
-#: 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 "Teljes n�v"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "Email"
 
@@ -2559,6 +2591,19 @@ msgstr ""
 "%s m�r l�tezik\n"
 "Szeretn�d fel�l�rni?"
 
+#: 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 "Fel�l�rod a f�jlt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "_2. c�m:"
@@ -2689,7 +2734,7 @@ msgstr "contact-list-editor"
 msgid "Contact List Editor"
 msgstr "C�mlista-szerkeszt�"
 
-#: 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 "Lista ment�se VCard-k�nt"
 
@@ -2739,7 +2784,7 @@ msgstr ""
 "c�mjegyz�kben. Mindenk�ppen hozz�adod?"
 
 #: 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 "Halad� keres�s"
 
@@ -2748,25 +2793,25 @@ msgstr "Halad� keres�s"
 msgid "Search"
 msgstr "Keres�s"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "0 k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Hiba %s ind�t�sakor"
 
-#: 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"
@@ -2778,10 +2823,10 @@ msgid "Success"
 msgstr "Siker�lt"
 
 #: 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 "Ismeretlen hiba"
 
@@ -2789,7 +2834,7 @@ msgstr "Ismeretlen hiba"
 msgid "Repository offline"
 msgstr "Kapcsolat n�lk�li t�rol�"
 
-#: 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 "Jogosults�gi hiba"
@@ -2810,8 +2855,8 @@ msgstr "A protokoll nem t�mogatott"
 #: 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 "Megszak�tva"
 
@@ -2860,7 +2905,7 @@ msgstr "Hiba a lista t�rl�sekor"
 
 #: 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 "Hiba a k�rtya t�rl�sekor"
 
@@ -2877,9 +2922,8 @@ msgstr "Megjelen�t�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
@@ -2968,7 +3012,7 @@ msgstr "C�mjegyz�k"
 
 #: 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 "Ment�s VCard-k�nt"
@@ -3045,7 +3089,7 @@ msgstr "M�sol�s"
 msgid "Paste"
 msgstr "Beilleszt�s"
 
-#: 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
@@ -3053,8 +3097,8 @@ msgstr "Beilleszt�s"
 msgid "Delete"
 msgstr "T�rl�s"
 
-#: 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 "Aktu�lis n�zet"
 
@@ -3062,7 +3106,7 @@ msgstr "Aktu�lis n�zet"
 #. 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,cs,d,e�,f,g,gy,h,i�,j,k,l,m,n,ny,o�,��,p,q,r,s,sz,t,ty,u�,��,v,w,"
@@ -3072,13 +3116,13 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c: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,cs,d,e�,f,g,gy,h,i�,j,k,l,m,n,ny,o�,��,p,q,r,s,sz,t,ty,u�,��,v,w,x,"
 "y,z,zs"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3214,7 +3258,7 @@ msgid "Include:"
 msgstr "Bele�rtve:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Fekv�"
 
@@ -3239,7 +3283,7 @@ msgid "Options"
 msgstr "Be�ll�t�sok"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Elhelyezked�s"
 
@@ -3262,7 +3306,7 @@ msgstr "Pap�r forr�s:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "�ll�"
 
@@ -3324,20 +3368,20 @@ msgstr "N�vtelen tal�lkoz�"
 
 #: 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 "Magas"
 
 #: 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 "Norm�lis"
 
 #: 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 "Alacsony"
 
@@ -3348,13 +3392,17 @@ msgstr "Alacsony"
 msgid "Undefined"
 msgstr "Nem megadott"
 
-#: 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 "Hib�s kommunik�ci� a napt�r kiszolg�l�val"
 
-#: 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 "Nem siker�lt a pilot Calendar application blokkj�t olvasni"
 
@@ -3462,11 +3510,11 @@ msgstr "Szundi id� (percek)"
 msgid "_Edit appointment"
 msgstr "_Tal�lkoz� szerkeszt�se"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Nincs le�r�s."
 
-#: 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"
@@ -3478,13 +3526,13 @@ msgstr ""
 "lett be�ll�tva. Az Evolution a szok�sos eml�keztet�\n"
 "p�rbesz�dablakot fogja ehelyett megjelen�teni."
 
-#: 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 "Figyelmeztet�s"
 
-#: 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 "
@@ -3501,16 +3549,16 @@ msgstr ""
 "\n"
 "Biztos futtatni akarod ezt a programot?"
 
-#: 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 "Ne k�rdezze meg t�bbet."
 
-#: 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 "Nem siker�lt a GNOME inicializ�l�sa"
 
-#: 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 "Nem siker�lt l�trehozni az riaszt� szolg�ltat�s factoryj�t"
 
@@ -3559,7 +3607,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 ""
@@ -3638,9 +3686,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
@@ -3657,13 +3705,13 @@ msgid "Assigned"
 msgstr "Kiosztva"
 
 #: 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 "Igen"
 
 #: 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 "Nem"
 
@@ -3683,75 +3731,95 @@ msgstr "H�tn�zet"
 msgid "Month View"
 msgstr "H�napn�zet"
 
-#: 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 "Napt�r"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Tal�lkoz�kat �s esem�nyeket tartalmaz� mappa"
 
-#: 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 "_Nyilv�nos napt�r URL:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Tal�lkoz�kat �s esem�nyeket tartalmaz� mappa"
+
+#: 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 "Feladatok"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Teend�ket tartalmaz� mappa"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Feladatok nyomtat�sa"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Teend�ket tartalmaz� mappa"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "�j tal�lkoz�"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "_Tal�lkoz�"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "�j tal�lkoz� l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "�j �rtekezlet"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "�_rtekezlet"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "�j feladat l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "�j feladat"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Feladat"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "�j feladat l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "New All Day Appointment"
 msgstr "�j eg�sz napos tal�lkoz�"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "All _Day Appointment"
 msgstr "_Eg�sz napos tal�lkoz�"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "�j tal�lkoz� l�trehoz�sa"
@@ -3794,30 +3862,31 @@ msgid "Alarm Repeat"
 msgstr "Riaszt�s ism�tl�se"
 
 #: 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 ""
+"Ez egy e-mail eml�keztet�, de az Evolution m�g nem t�mogatja ezt a fajt�j�t "
+"az eml�keztet�knek. Nem fogod tudni szerkeszteni ennek az eml�keztet�nek a "
+"tulajdons�gait."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Megjelen�tend� �zenet"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Hangjelz�s:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Riaszt�s megism�tl�se"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Program futtat�sa:"
 
-#: 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 ""
-"Ez egy e-mail eml�keztet�, de az Evolution m�g nem t�mogatja ezt a fajt�j�t "
-"az eml�keztet�knek. Nem fogod tudni szerkeszteni ennek az eml�keztet�nek a "
-"tulajdons�gait."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Ezekkel az argumentumokkal:"
@@ -3841,110 +3910,110 @@ msgstr "�r�nk�nt"
 msgid "minutes"
 msgstr "percenk�nt"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d nappal"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 nappal"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d h�t"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 h�t"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d �r�val"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 �r�val"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d perccel"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 perccel"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d m�sodperc"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 m�sodperc"
 
-#: 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 "Hangjelz�s"
 
-#: 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 "Lev�l megjelen�t�se"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Lev�l k�ld�se"
 
-#: 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 "Program futtat�sa"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Ismeretlen m�veletet k�sz�lsz v�grehajtani"
 
-#: 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 a tal�lkoz� kezdete el�tt"
 
-#: 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 a tal�lkoz� kezdete ut�n"
 
-#: 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 a tal�lkoz� kezdetekor"
 
-#: 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 a tal�lkoz� v�ge el�tt"
 
-#: 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 a tal�lkoz� v�ge ut�n"
 
-#: 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 a tal�lkoz� v�g�n"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s %s-kor"
 
-#: 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 ismeretlen kiv�lt� okra"
@@ -3965,7 +4034,7 @@ msgstr "Eml�keztet�k"
 
 #: 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 "�sszefoglal�:"
 
@@ -4047,7 +4116,7 @@ msgid "Days"
 msgstr "nappal"
 
 #: 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 "P�ntek"
 
@@ -4060,7 +4129,7 @@ msgid "Minutes"
 msgstr "perccel"
 
 #: 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 "H�tf�"
 
@@ -4069,7 +4138,7 @@ msgid "S_un"
 msgstr "_V"
 
 #: 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 "Szombat"
 
@@ -4082,7 +4151,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "H�t _sz�m�nak megjelen�t�se a d�tumnavig�torban"
 
 #: 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 "Vas�rnap"
 
@@ -4099,7 +4168,7 @@ msgid "Task List"
 msgstr "Feladatlista"
 
 #: 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 "Cs�t�rt�k"
 
@@ -4116,7 +4185,7 @@ msgid "Time format:"
 msgstr "Id�form�tum:"
 
 #: 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 "Kedd"
 
@@ -4125,7 +4194,7 @@ msgid "W_eek starts:"
 msgstr "_H�t kezdete:"
 
 #: 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 "Szerda"
 
@@ -4341,8 +4410,8 @@ msgid "No summary"
 msgstr "Nincs �sszegz�s"
 
 #: 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 "Ment�s m�sk�nt..."
 
@@ -4411,27 +4480,27 @@ msgstr "A feladat v�grehajt�ja:"
 msgid "Enter Delegate"
 msgstr "V�grehajt� megad�sa"
 
-#: 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 "Tal�lkoz�"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Eml�keztet�"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Ism�tl�d�s"
 
-#: 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 "�temez�s"
 
-#: 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 "�rtekezlet"
 
@@ -4500,19 +4569,19 @@ msgstr "_Befejez�s id�pontja:"
 msgid "_Start time:"
 msgstr "_Kezd�s id�pontja:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "A szervez�t be kell �ll�tani."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Legal�bb egy r�sztvev� sz�ks�ges."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Ez a szem�ly m�r rajta van a r�sztvev�k list�j�n!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Feladatkiad�s..."
 
@@ -4552,7 +4621,7 @@ msgid "Member"
 msgstr "Tag"
 
 #: 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"
@@ -4564,7 +4633,7 @@ msgstr "Szerep"
 
 #: 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 "�llapot"
@@ -4639,43 +4708,43 @@ msgstr ""
 "Ez a tal�lkoz� olyan ism�tl�d�seket tartalmaz, amelyeket az Evolution nem "
 "tud szerkeszteni."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "ekkor:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 msgid "first"
 msgstr "els�"
 
-#: 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 "m�sodperc"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 msgid "third"
 msgstr "harmadik"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 msgid "fourth"
 msgstr "negyedik"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 msgid "last"
 msgstr "utols�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "Other Date"
 msgstr "Egy�b d�tum"
 
-#: 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 "nap"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "el�fordul�sok"
 
@@ -4767,7 +4836,7 @@ msgstr "Teljes�t�s d�tuma:"
 
 #: 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 "Beavatkoz�s sz�ks�ges"
 
@@ -4776,7 +4845,7 @@ msgid "Progress"
 msgstr "Folyamatban"
 
 #: 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:"
 
@@ -4788,17 +4857,17 @@ msgstr "_Priorit�s:"
 msgid "_Status:"
 msgstr "�ll_apot:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Egyszer�"
 
-#: 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 "Kioszt�s"
 
-#: 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:"
@@ -4868,12 +4937,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 "Kijel�lt objektumok t�rl�se"
 
-#: 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 "_Megnyit�s"
@@ -4882,30 +4951,30 @@ msgstr "_Megnyit�s"
 msgid "_Save as..."
 msgstr "_Ment�s m�sk�nt..."
 
-#: 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 "_Nyomtat�s..."
 
-#: 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_iv�g�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 "_M�sol�s"
 
-#: 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"
@@ -4931,12 +5000,12 @@ msgstr "_Kijel�lt feladatok megjel�l�se k�szk�nt"
 msgid "_Delete Selected Tasks"
 msgstr "_Kijel�lt feladatok t�rl�se"
 
-#: calendar/gui/e-calendar-table.c: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 "Objektumok friss�t�se"
 
-#: 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 "Kattints ide �j feladat hozz�ad�s�hoz"
@@ -4945,8 +5014,8 @@ msgstr "Kattints ide �j feladat hozz�ad�s�hoz"
 msgid "Alarms"
 msgstr "�breszt�k"
 
-#: 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 "K�sz"
 
@@ -4975,7 +5044,7 @@ msgid "Start Date"
 msgstr "Kezd�s d�tuma"
 
 #: 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 "�sszefoglal�"
@@ -5042,439 +5111,445 @@ msgstr "de"
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "�j _tal�lkoz�"
 
-#: 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 "�_j eg�sz napos esem�ny"
 
-#: 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 "�j �rtekezlet"
 
-#: 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 "�j feladat"
 
-#: 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 "Nyomtat�s..."
 
-#: 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 "Ugr�s a _mai napra"
 
-#: 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 "_Ugr�s d�tumra..."
 
-#: 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 "Szabad/foglalt inform�ci� _k�zz�t�tele"
 
-#: 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 "_Be�ll�t�sok..."
 
-#: 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 be�ll�t�sai..."
 
-#: 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 "M_ent�s m�sk�nt..."
 
-#: 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 "�rtekezlet _tervez�se..."
 
-#: 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 "_Tov�bb�t�s iCalendark�nt..."
 
-#: 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 "Az el�fordul�s _mozgathat�v� t�tele"
 
-#: 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 "Az _el�fordul�s t�rl�se"
 
-#: 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 "Az �_sszes el�fordul�s t�rl�se"
 
-#: 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 "�gy t�nik, hogy nincsenek telep�tve a rendszerre GNOME Pilot eszk�z�k."
 
-#: 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 "Hiba a %s v�grehajt�sa k�zben."
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr "<b>Kezd�dik:</b> "
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 msgid "<b>Ends:</b> "
 msgstr "<b>V�ge:</b> "
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 msgid "<b>Completed:</b> "
 msgstr "<b>K�sz:</b> "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr "<b>Hat�rid�:</b> "
 
-#: 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 inform�ci�"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "iCalendar hiba"
 
-#: 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 "Ismeretlen szem�ly"
 
 #. 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> Olvasd el a k�vetkez�ket, �s v�lassz ki egy m�veletet az al�bbi men�b�l."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Nincs</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 msgid "Location:"
 msgstr "Hely:"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "�llapot:"
 
-#: 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 "Elfogadva"
 
-#: 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 "K�s�rletileg elfogadva"
 
-#: 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 "Elutas�tva"
 
-#: 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 "Ismeretlen"
 
-#: 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�lassz egy m�veletet:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Friss�t�s"
 
-#: 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 "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "K�s�rletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Elutas�tva"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Szabad/foglalt inform�ci� k�ld�se"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "V�laszol� �llapot�nak friss�t�se"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Legut�bbi inform�ci� k�ld�se"
 
-#: 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 "M�gse"
 
-#: 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> inform�ci�t tett k�zz� az �rtekezletr�l."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Inform�ci� az �rtekezletr�l"
 
-#: 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> arra k�r, hogy vegy�l r�szt az �rtekezleten."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Javaslat �rtekezletre"
 
-#: 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> szeretne hozz�tenni egy l�tez� �rtekezlethez."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "�rtekezlet friss�t�se"
 
-#: 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> szeretn� megkapni a leg�jabb adatokat az �rtekezletr�l."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "�rtekezletfriss�t�si k�r�s"
 
-#: 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> v�laszolt egy �rtekezlet-�sszeh�v�si k�r�sre."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "V�lasz az �rtekezletre"
 
-#: 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> lemondta az �rtekezletet."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "�rtekezlet lemond�sa"
 
-#: 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> egy �rtelmetlen levelet k�ld�tt."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Rossz �rtekezletfelh�v�s"
 
-#: 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> feladatinform�ci�t tett k�zz�."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Feladatinform�ci�"
 
-#: 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> arra k�r, hogy hajts v�gre egy feladatot."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Feladatjavaslat"
 
-#: 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> szeretne hozz�tenni egy l�tez� feladathoz."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Feladat friss�t�se"
 
-#: 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> szeretn� megkapni a leg�jabb adatokat a feladatr�l."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Feladatfriss�t�si felh�v�s"
 
-#: 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�laszolt egy feladatfelk�r�sre."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "V�lasz feladatra"
 
-#: 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> t�r�lte a feladatot."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Feladat lemond�sa"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Rossz feladat�zenet"
 
-#: 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> szabad/foglalt inform�ci�t tett k�zz�."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Szabad/foglalt inform�ci�"
 
-#: 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> k�ri a szabad/foglalt adataidat."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Szabad/foglalt k�r�s"
 
-#: 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> v�laszolt egy szabad/foglalt k�r�sre."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Szabad/foglalt v�lasz"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Rossz szabad/foglalt �zenet"
 
-#: 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 "A lev�l �gy t�nik, nem megfelel�en form�zott"
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "A lev�l csak nem t�mogatott k�r�seket tartalmaz."
 
-#: calendar/gui/e-itip-control.c: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 "A mell�klet nem tartalmaz �rv�nyes napt�r�zenetet"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "A mell�klet nem tartalmaz megn�zhet� napt�relemet"
 
-#: 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 "Az objektum �rv�nytelen �s nem lehet friss�teni\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 "CORBA hiba t�rt�nt\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 "Az elem nem tal�lhat�\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 "Nincs jogosults�god a napt�r friss�t�s�hez\n"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Friss�t�s k�sz\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "A napt�rf�jlt nem lehetett friss�teni!\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 ""
 "A r�sztvev� �llapot�t nem lehetett friss�teni, mert az elem nem l�tezik t�bb�"
 
-#: 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 ""
 "A v�lasz oylant�l �rkezett, aki nem r�sztvev�. Hozz�adod a r�sztvev�kh�z?"
 
-#: 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 ""
 "A r�sztvev� �llapot�t nem lehetett friss�teni, mert az �llapot �rv�nytelen!\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 "Nincs jogosults�god a napt�r friss�t�s�hez\n"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "A r�sztvev� �llapota friss�tve\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "A r�sztvev� �llapot�t nem lehetett friss�teni!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "T�rl�s befejezve"
 
-#: 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 "Elk�ldve!\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 "Az elemet nem lehetett elk�ldeni!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 msgid "Select Calendar Folder"
 msgstr "V�lassz napt�rmapp�t"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 msgid "Select Tasks Folder"
 msgstr "V�lassz feladatmapp�t"
 
@@ -5519,7 +5594,7 @@ msgstr "date-start"
 msgid "Chair Persons"
 msgstr "Eln�k"
 
-#: 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 "Sz�ks�ges r�sztvev�k"
 
@@ -5532,52 +5607,52 @@ msgid "Resources"
 msgstr "Er�forr�sok"
 
 #: 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 "Egy�n"
 
 #: 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 "Csoport"
 
 #: 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 "Er�forr�s"
 
 #: 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 "Szoba"
 
 #: 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 "Levezet�"
 
 #: 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 "Sz�ks�ges r�sztvev�k"
 
 #: 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 "Esetleges r�sztvev�"
 
 #: 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 "Nem vesz r�szt"
 
 #: 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 "K�s�rleti"
 
 #: 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 "Deleg�lt"
 
@@ -5667,40 +5742,47 @@ msgstr "Megbesz�l�s _kezd�dik:"
 msgid "Meeting _end time:"
 msgstr "Megbesz�l�s _v�ge:"
 
-#: 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 "Feladatok megnyit�sa %s-kor"
 
-#: 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 "Nem siker�lt bet�lteni a feladatot %s-be."
 
-#: 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' bet�lt�s�hez sz�ks�ges elj�r�s nem t�mogatott"
 
-#: 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 "Nem siker�lt megnyitni a mapp�t '%s'-ben"
 
-#: 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 "Hiba %s ind�t�sakor"
+
+#: calendar/gui/e-tasks.c:540
 msgid "Completing tasks..."
 msgstr "Feladatok befejez�se..."
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 msgid "Deleting selected objects..."
 msgstr "Kijel�lt objektumok t�rl�se..."
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Tiszt�t�s"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "�j _tal�lkoz�..."
 
@@ -5714,7 +5796,13 @@ msgstr "Nem siker�lt megnyitni a mapp�t '%s'-ben"
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' megnyit�s�hoz sz�ks�ges elj�r�s nem t�mogatott"
 
-#: 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 "�breszt� %s-kor"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5722,7 +5810,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"
@@ -5730,12 +5818,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 "Napt�r megnyit�sa %s-kor"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s mappa megnyit�sa"
@@ -5796,47 +5884,56 @@ msgstr "okt�ber"
 msgid "September"
 msgstr "szeptember"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Legal�bb egy r�sztvev� sz�ks�ges"
-
-#: 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 "A szervez�t be kell �ll�tani."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Legal�bb egy r�sztvev� sz�ks�ges"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Esem�nyinform�ci�"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Feladatinform�ci�"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Napl�inform�ci�"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Szabad/foglalt inform�ci�"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Napt�rinform�ci�"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr "Friss�tve"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr "Friss�t�s"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr "Ellenjavaslat"
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Szabad/foglalt inform�ci� (%s - %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "iCalendar inform�ci�"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "R�szt kell venned az esem�nyen."
 
@@ -6071,7 +6168,7 @@ msgid "Print Calendar"
 msgstr "Napt�r nyomtat�sa"
 
 #: 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 "Nyomtat�si k�p"
@@ -6095,7 +6192,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "A megjelen�tend� feladatmappa URI-ja"
 
-#: 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"
@@ -6107,12 +6204,12 @@ msgstr ""
 "\n"
 "T�nyleg t�rl�d ezeket a feladatok?"
 
-#: 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 k�rdezze meg t�bbet."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 msgid "Print Tasks"
 msgstr "Feladatok nyomtat�sa"
 
@@ -6185,15 +6282,15 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Nem siker�lt kapcsol�dni a t�rol�hoz: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 msgid "Reminder!!"
 msgstr "Eml�keztet�!!"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 msgid "Calendar Events"
 msgstr "Napt�resem�nyek"
 
-#: 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?"
@@ -6201,85 +6298,85 @@ msgstr ""
 "Az Evolution Gnome Calendar f�jlokat tal�lt.\n"
 "Szeretn�d ezeket az Evolutionbe import�lni?"
 
-#: 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 "a time-now 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "a make-time 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "a make-time els� argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "a make-time els� argumentum�nak ISO 8601 d�tum/id� karakterl�ncnak kell "
 "lennie"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "a time-add-day 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "a time-day-add els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "a time-add-day m�sodik argumentumak�nt eg�sz sz�mot v�r"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "a time-day-begin 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "a time-day-begin els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "a time-day-end 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "a time-day-end els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "a get-vtype 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "az occur-in-time-range? 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "az occur-in-time-range? els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "az occur-in-time-range? m�sodik argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "a contains? 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "a contains? els� argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "a contains? m�sodik argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6287,11 +6384,11 @@ msgstr ""
 "a contains? els� argumentumak�nt a k�vetkez�k egyik�t v�rja: \"any\", "
 "\"summary\", \"description\""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "a has-categories? legal�bb egy argumentumot v�r"
 
-#: 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)"
@@ -6299,22 +6396,27 @@ msgstr ""
 "a has-categories? minden argumentumak�nt karakterl�ncot v�r, vagy csak "
 "egyetlen logikai hamis (#f) �rt�ket"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "az is-completed? 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "a completed-before? 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "a completed-before? els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "A keres�si kifejez�s ki�rt�kel�se nem logikai �rt�kre vezetett"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "�rtelmez�si hiba"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -7907,82 +8009,82 @@ msgstr "%s mappa t�rol�sa"
 msgid "You must be working online to complete this operation"
 msgstr "A m�velet befejez�s�hez h�l�zati kapcsolattal kell rendelkezned"
 
-#: 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 "Mapp�k szinkroniz�l�sa"
 
-#: 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 "Hiba a sz�r� feldolgoz�sa k�zben: %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 "Hiba a sz�r� v�grehajt�sa k�zben: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Nem siker�lt megnyitni spool mapp�t"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Nem siker�lt feldolgozni a spool mapp�t"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d. lev�l let�lt�se (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Nem lehet megnyitni a levelet"
 
-#: 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. lev�l rossz"
 
-#: 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 "Mappa szinkroniz�l�sa"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Levelek let�lt�se: %d/%d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Hiba a %d / %d �zenetn�l"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "A lev�l dek�dol�sa sikertelen."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "�rv�nytelen argumentumok"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "�rv�nytelen argumentumok"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nem siker�lt gyorst�razni %s �zenetet: %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 "Nem siker�lt gyorst�razni %s �zenetet: %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 "Hiba a sz�rt keres�s v�grehajt�sa k�zben: %s: %s"
@@ -8029,11 +8131,11 @@ msgstr "Nem t�mogatott m�velet: keres�s kifejez�s szerint: %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nem t�mogatott m�velet: keres�s uid szerint: %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Levelek �thelyz�se"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Copying messages"
 msgstr "Levelek m�sol�sa"
 
@@ -8355,7 +8457,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 "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l"
 
@@ -8412,51 +8514,51 @@ msgstr "POP az SMTP hiteles�t�s el�tt nem pop forr�s haszn�lat�val"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "A regul�ris kifejez�s leford�t�sa sikertelen: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URL-ben kell lennie felhaszn�l�n�v �sszetev�nek"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URL-ben kell lennie g�pn�v �sszetev�nek"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL-ben kell lennie �tvonal �sszetev�nek"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "'%s' felold�sa"
 
-#: 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 "Sikertelen n�vkikeres�s: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Sikertelen g�pkikeres�s: %s: a g�p nem tal�lhat�"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Sikertelen g�pkikeres�s: %s: ismeretlen ok"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "C�m felold�sa"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Sikertelen g�pkikeres�s: %s: a g�p nem tal�lhat�"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Sikertelen g�pkikeres�s: %s: ismeretlen ok"
@@ -8659,7 +8761,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"
@@ -8672,11 +8774,11 @@ msgstr ""
 "Ujjlenyomat:       %s\n"
 "Al��r�s:           %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 "GOOD"
 
-#: 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"
 
@@ -8699,7 +8801,7 @@ msgstr ""
 "Elfogadod m�gis?"
 
 #. 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"
@@ -8755,68 +8857,76 @@ msgstr "Nem siker�lt �tnevezni a mapp�t: %s: �rv�nytelen m�velet"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nem siker�lt �tnevezni a mapp�t: %s: Nincs ilyen mappa"
 
-#: 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�velet megszak�tva"
 
-#: 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 "A kiszolg�l� v�ratlanul sz�tkapcsolt: %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 "V�ratlan v�lasz az IMAP kiszolg�l�t�l: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "V�ratlan v�lasz az IMAP kiszolg�l�t�l: %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 "Az IMAP parancs sikertelen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "A kiszolg�l� v�lasza t�l hamar v�get�rt."
 
-#: 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 "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
 
-#: 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 "V�ratlan OK v�lasz az IMAP kiszolg�l�t�l: %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 "Nem siker�lt l�trehozni %s k�nyvt�rat: %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 "Nem siker�lt bet�lteni %s �sszefoglal�j�t"
 
-#: 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 "A mappa megsemmis�lt �s �jra l�tre lett hozva a kiszolg�l�n"
 
 #. 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 "Megv�ltozott levelek keres�se"
 
-#: 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 "A lev�l dek�dol�sa sikertelen."
 
-#: 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
@@ -8832,28 +8942,24 @@ msgstr ""
 "Nem siker�lt bet�lteni a levelet: %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 "Nincs ilyen lev�l"
 
-#: 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 "Ez a lev�l jelenleg nem el�rhet�"
 
-#: 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 "�sszefoglal� adatok let�lt�se az �j levelekhez."
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "�j levelek keres�se"
-
-#: 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 "Nem tal�lhat� a lev�lt�rzs a FETCH v�laszban."
 
@@ -8870,6 +8976,11 @@ msgstr "Nem siker�lt megnyitni a gyorst�r k�nyvt�r�t: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Nem siker�lt gyorst�razni %s �zenetet: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Nem siker�lt gyorst�razni %s �zenetet: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "�j levelek keres�se"
@@ -8918,75 +9029,70 @@ msgstr ""
 "Ez a be�ll�t�s sima sz�veges jelsz�val l�tes�t kapcsolatot az IMAP "
 "kiszolg�l�val."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr "%s IMAP-kiszolg�l�"
 
-#: 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 szolg�ltat�s %s-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 "Kapcsolat megszak�tva"
 
-#: 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 "Nem siker�lt csatlakozni %s %d portj�hoz: %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 ""
 "Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
 "Hiba a felhaszn�l�n�v k�ld�se k�zben: %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 kiterjeszt�s nem t�mogatott"
 
-#: 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-t�rgyal�s sikertelen"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "A mappa nem �res."
-
-#: 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 kiszolg�l� nem t�mogatja a k�rt %s hiteles�t�si t�pust"
 
-#: 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 hiteles�t�si t�pus nem t�mogatott"
 
-#: 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 "%sAdd meg %s@%s IMAP jelszav�t!"
 
-#: 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 "Nem adt�l meg jelsz�t."
 
-#: 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"
@@ -8997,24 +9103,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 "Nincs %s mappa."
 
-#: 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 "A mappan�v nem tartalmazhatja a Return karaktert."
 
-#: 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 "Ismeretlen hiba: %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 "A sz�l�mappa nem tartalmazhat almapp�kat"
 
@@ -9090,8 +9196,8 @@ msgid ""
 msgstr "A helyi levelek olvas�sa �s t�rol�sa szabv�nyos mbox spool f�jlokban"
 
 #: 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 t�rol�gy�k�r nem abszol�t �tvonal"
@@ -9103,7 +9209,7 @@ msgstr "%s t�rol�gy�k�r nem k�z�ns�ges k�nyvt�r"
 
 #: 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 "Nem siker�lt bet�lteni a mapp�t: %s: %s"
@@ -9117,32 +9223,32 @@ msgstr "A helyi t�rol�k nem rendelkeznek Bej�v� mapp�val"
 msgid "Local mail file %s"
 msgstr "%s helyi lev�l f�jl"
 
-#: 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 "Nem siker�lt %s mapp�t %s n�vre �tnevezni: %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 "Nem siker�lt �tnevezni ezt a mapp�t: %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 "Nem siker�lt '%s' mappa�sszegz�f�jt t�r�lni: %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 "Nem siker�lt '%s' mappaindexf�jlt t�r�lni: %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 "Nem siker�lt menteni az �sszefoglal�t: %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 "Nem siker�lt hozz�adni a levelet az �sszefoglal�hoz: ismeretlen ok"
 
@@ -9162,6 +9268,7 @@ msgstr "A lev�l tartalma �rv�nytelen"
 
 #: 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"
@@ -9173,12 +9280,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' mappa nem l�tezik."
 
 #: 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"
@@ -9204,7 +9313,8 @@ msgid "not a maildir directory"
 msgstr "nem maildir k�nyvt�r"
 
 #: 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 "Nem siker�lt p�szt�zni ezt a mapp�t: `%s': %s"
@@ -9234,7 +9344,7 @@ msgid "Storing folder"
 msgstr "Mappa t�rol�sa"
 
 #: 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 "Nem siker�lt z�rolni %s k�nyvt�rat: %s"
@@ -9403,40 +9513,45 @@ msgstr "`%s' nem k�nyvt�r."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nem siker�lt megnyitni az MH k�nyvt�r el�r�si �tj�t: %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 mapp�t nem lehet �tnevezni"
 
-#: 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 t�rol�gy�k�r nem k�z�ns�ges k�nyvt�r"
 
-#: 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' mappa nem l�tezik."
 
-#: 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' nem k�z�ns�ges f�jl."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr "A t�rol� nem t�mogatja az INBOX-ot"
 
-#: 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 lev�lf�jl"
 
-#: 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 mapp�t nem lehet �tnevezni"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Spool mapp�t nem lehet �tnevezni"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Spool mapp�t nem lehet t�r�lni"
 
@@ -9527,47 +9642,47 @@ msgstr "Felhaszn�l� megszak�totta"
 msgid "Operation failed: %s"
 msgstr "M�velet sikertelen: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "POP �sszefoglal� let�lt�se"
 
-#: 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 "Felhaszn�l� megszak�totta"
 
-#: 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 "Nem siker�lt let�lteni a POP-�sszefoglal�t: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "A t�rl�sre kijel�lt levelek elt�vol�t�sa"
 
-#: 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 "Nincs %s azonos�t�j� lev�l"
 
 #. 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 lev�l let�lt�se"
 
-#: 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 "Nem siker�lt bet�lteni a levelet: %s:  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
@@ -9839,45 +9954,45 @@ msgstr "Ideiglenes hiteles�t�si hiba"
 msgid "Authentication required"
 msgstr "Hiteles�t�s sz�ks�ges"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Hib�s RSET v�lasz: %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 ""
 "Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
 "Hiba a felhaszn�l�n�v k�ld�se k�zben: %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 "A lev�l �gy t�nik, nem megfelel�en form�zott"
 
-#: 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 "Id�t�ll�p�s az AUTH k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Hib�s RSET v�lasz: %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 kiszolg�l� nem t�mogatja a k�rt %s hiteles�t�si t�pust"
 
-#: 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 "%sAdd meg %s@%s SMTP jelszav�t"
 
-#: 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"
@@ -9888,90 +10003,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 kiszolg�l�"
 
-#: 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 lev�lk�ld�s %s kiszolg�l�n �t"
 
-#: 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 "Nem lehet elk�ldeni a levelet: a felad� c�me �rv�nytelen."
 
-#: 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 "Lev�l k�ld�se"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: 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 "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP �dv�zlet"
 
-#: 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 "Id�t�ll�p�s az RSET k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Hib�s RSET v�lasz: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP hiteles�t�s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Hiba a SASL hiteles�t�si objektum l�trehoz�sakor."
 
-#: 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 "Id�t�ll�p�s az AUTH k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH k�r�s sikertelen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l.\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 "Id�t�ll�p�s a MAIL FROM k�r�sn�l: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Hib�s MAIL FROM v�lasz: %s: a lev�l nem ment el"
 
-#: 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 "Id�t�ll�p�s az RCPT TO k�r�sn�l: %s: a lev�l nem ment el"
 
-#: 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> sikertelen"
 
-#: 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 "Id�t�ll�p�s a DATA k�r�sn�l: %s: a lev�l nem ment el"
@@ -9979,80 +10094,71 @@ msgstr "Id�t�ll�p�s a DATA k�r�sn�l: %s: a lev�l nem ment el"
 #. 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 "Hib�s DATA v�lasz"
 
-#: 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 ""
 "Id�t�ll�p�s a DATA k�ld�s�n�l: a lev�l v�get �rt: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l"
 
-#: 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 "Id�t�ll�p�s az RSET k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "Hib�s RSET v�lasz: %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 "Id�t�ll�p�s az AUTH k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Hib�s RSET v�lasz: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 b�jt"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u b�jt"
-
-#: 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 "mell�klet"
 
-#: 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 "T�rli a kiv�lasztott elemeket a mell�kletlist�r�l"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Csatol�s..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "F�jl csatol�sa a lev�lhez"
 
@@ -10084,7 +10190,7 @@ msgstr "MIME-t�pus:"
 msgid "Suggest automatic display of attachment"
 msgstr "Javasolja a mell�klet automatikus megjelen�t�s�t"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 
@@ -10095,45 +10201,45 @@ msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 #. * 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 "V�laszc�m:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Felad�:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "T�rgy:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "C�mzett:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "�rd be a lev�l c�mzettj�t"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "M�solat:"
 
-#: 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 "�rd be, kik kapjanak m�solatot a lev�lr�l"
 
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Rejtett m�solat:"
 
-#: 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."
@@ -10144,12 +10250,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 "Nincs le�r�s"
@@ -10164,7 +10270,7 @@ msgstr "F�jl csatol�sa"
 msgid "Could not create a PGP signature context"
 msgstr "Nem siker�lt l�trehozni a PGP al��r�s r�szt."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10173,34 +10279,34 @@ msgstr ""
 "F�jlbeolvas�si hiba: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Figyelem!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "A f�jl l�tezik, fel�l�rod?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "F�jlment�si hiba: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "F�jlbet�lt�si hiba: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "F�jlel�r�si hiba: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Nem siker�lt bet�lteni a levelet a szerkeszt�b�l"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10209,7 +10315,7 @@ msgstr ""
 "Nem siker�lt keresni a f�jlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10218,7 +10324,7 @@ msgstr ""
 "Nem siker�lt csonkolni a  f�jlt: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10227,7 +10333,7 @@ msgstr ""
 "Hiba a levelek automatikus ment�se k�zben: %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?"
@@ -10236,28 +10342,39 @@ msgstr ""
 "f�jlokat.\n"
 "Szeretn�d megk�s�relni a vissza�ll�t�sukat?"
 
-#: 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 ""
+"A lev�l nem lett elk�ldve.\n"
+"\n"
+"Akarod menteni a v�ltoz�saidat?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Figyelem: M�dos�tott lev�l"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "F�jl megnyit�s"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "_Al��r�s"
 
-#: 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 "Lev�l �r�sa"
 
-#: 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."
@@ -10265,7 +10382,18 @@ msgstr ""
 "Nem siker�lt l�trehozni a szerkeszt�ablakot:\n"
 "Nem lehetett aktiv�lni a c�mkiv�laszt� kontrollt."
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c: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 ""
+"Nem siker�lt l�trehozni a szerkeszt�ablakot:\n"
+"A HTML-szerkeszt� komponens aktiv�l�sa sikertelen."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10273,13 +10401,13 @@ msgstr ""
 "Nem siker�lt l�trehozni a szerkeszt�ablakot:\n"
 "A HTML-szerkeszt� komponens aktiv�l�sa sikertelen."
 
-#: 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."
@@ -10287,8 +10415,9 @@ msgstr ""
 "Nem siker�lt l�trehozni a szerkeszt�ablakot, mert m�g nem\n"
 "�ll�tott�l be egy azonos�t�t sem a levelez�komponensben."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Az Evolution levelez� komponens�t nem siker�lt inicializ�lni."
 
 #: data/evolution.desktop.in.h:1
@@ -10339,8 +10468,8 @@ msgstr "A t�rgy tartalmazza"
 msgid "Subject does not contain"
 msgstr "A t�rgy nem tartalmazza"
 
-#: 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?"
@@ -10488,7 +10617,8 @@ msgid "years"
 msgstr "�vek"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Elfelejtetted kiv�lasztani a d�tumot."
 
 #: filter/filter-datespec.c:269
@@ -10542,15 +10672,12 @@ msgid "Add action"
 msgstr "M�velet hozz�ad�sa"
 
 #: 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 ""
-"Elfelejtett�l mapp�t v�lasztani.\n"
-"L�pj vissza, �s adj meg egy �rv�nyes mappanevet, ahov� a leveleket k�red."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Meg kell adnod egy f�jlnevet"
 
-#: 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�lassz mapp�t"
 
@@ -10563,7 +10690,7 @@ msgstr ""
 "Hiba a '%s' regul�ris kifejez�sben:\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 "Fontos"
@@ -10746,222 +10873,226 @@ msgid "Beep"
 msgstr "Hangjelz�s"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "tartalmazza"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Mapp�ba m�sol�s"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Fogad�s d�tuma"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "K�ld�s d�tuma"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "T�r�lt"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "nem tartalmazza"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nem v�gz�dik"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "nem l�tezik"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "nem l�tezik"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "nem �gy hangzik, mint"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "nincs az elej�n"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Nem l�tezik"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Piszkozat"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "v�gz�dik"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "L�tezik"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "l�tezik"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Kifejez�s"
 
-#: 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
-msgid "is after"
-msgstr "ut�n volt"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "el�tte volt"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "megjel�lt"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "nagyobb mint"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "kisebb mint"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nem"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "nem megjel�lt"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 msgid "Label"
 msgstr "C�mke"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Levelez�lista"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Lev�lt�rzs"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Lev�l fejl�ce"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "�thelyez�s mapp�ba"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "H�jparancs kiad�sa"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 msgid "Play Sound"
 msgstr "Hangjelz�s"
 
-#: 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 "Olvasott"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "C�mzettek"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Regex illeszked�s"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "V�lasz"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "nagyobb mint"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "kisebb mint"
+#: 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 "Pontsz�m"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Felad�"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "�llapot be�ll�t�sa"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "H�jparancs kiad�sa"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "M�ret (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "�gy hangzik, mint"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Forr�spostafi�k"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Adott fejl�c"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "�gy kezd�dik:"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Feldolgoz�s le�ll�t�sa"
 
-#: 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 "T�rgy"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "�llapot be�ll�t�sa"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "tartalmazza"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "nem tartalmazza"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "nem v�gz�dik"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "nem l�tezik"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "nem l�tezik"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "nem �gy hangzik, mint"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "nincs az elej�n"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "v�gz�dik"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "l�tezik"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "megjel�lt"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "ut�n volt"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "el�tte volt"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "nagyobb mint"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "kisebb mint"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "nem megjel�lt"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "nem"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "="
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "nagyobb mint"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "kisebb mint"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "�gy hangzik, mint"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "�gy kezd�dik:"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Szab�lyok"
@@ -10995,31 +11126,31 @@ msgstr "Legal�bb egy mapp�t meg kell adnod, mint forr�st."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Az Evolution import�lja a r�gi Elm leveleket."
 
-#: 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 "Import�l�s folyamatban..."
 
-#: 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 "V�rj"
 
-#: 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 import�l�sa %s-k�nt"
 
-#: 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 p�szt�z�sa"
 
-#: 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 "Lev�l"
 
@@ -11080,38 +11211,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 "Az Evolution import�lja a r�gi Netscape adatokat."
 
 #. 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 "Kuka"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "%s helyi lev�l f�jl"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Mappa p�szt�z�sa"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Import�l�s kezdete"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Be�ll�t�sok"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 msgid "Mail Filters"
 msgstr "Lev�lsz�r�k"
 
-#: 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?"
@@ -11227,26 +11358,36 @@ msgid "Folder containing mail"
 msgstr "Leveleket tartalmaz� mappa"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Nyilv�nos"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Leveleket tartalmaz� mappa"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Virtu�lis kuka"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Virtu�lis kukamappa"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Ez a mappa nem tartalmazhat leveleket."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Tulajdons�gok..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Mappa tulajdons�gainak m�dos�t�sa"
 
-#: 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."
@@ -11254,78 +11395,79 @@ msgstr ""
 "A levelez�d egyes be�ll�t�sai hib�snak t�nnek, ellen�rizd, hogy minden "
 "rendben van-e."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "A lev�lk�ld�s m�dja nincs be�ll�tva"
 
-#: mail/component-factory.c: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 "Figyelem: M�dos�tott lev�l"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "�j lev�l"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Lev�l"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Lev�l �r�sa"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "�j lev�l"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Lev�l _nyomtat�sa"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Lev�l �r�sa"
 
-#: 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 "Nem siker�lt az Evolution levelez� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nem siker�lt az Evolution levelez�be�ll�t� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nem siker�lt az Evolution mappainf� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Nem siker�lt regisztr�lni a t�rol�t a h�jban"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" tulajdons�gai"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Tulajdons�gok"
 
-#: 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 "Nem siker�lt l�trehozni az ideiglenes k�nyvt�rat: %s"
@@ -11370,129 +11512,129 @@ msgstr "%d elk�ldve"
 msgid "%d total"
 msgstr "�sszesen %d"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtu�lis mappa gy�rt�sa a keres�sb�l"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "VMappa a _t�rgyra"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _felad�ra"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _c�mzettekre"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelez�list�ra"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Sz�_r� a t�rgyra"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Sz�r� a f_elad�ra"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Sz�r� a _c�mzettekre"
 
-#: 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 "Sz�r� a _levelez�list�ra"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "S_zerkeszt�s �j lev�lk�nt..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Nyomtat�s"
 
-#: 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 "_V�lasz a felad�nak"
 
-#: 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 "V�lasz a _list�nak"
 
-#: 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 "V�lasz _mindenkinek"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "Tov�bb�t�s"
 
-#: 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 "_K�sz z�szl�"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 msgid "Cl_ear Flag"
 msgstr "_Z�szl� t�rl�se"
 
 #. 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 "_Elolvasva"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 msgid "Mark as _Unread"
 msgstr "_Olvasatlan"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 msgid "_Mark as Unimportant"
 msgstr "_Nem fontos"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 msgid "U_ndelete"
 msgstr "_Vissza�ll�t�s"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 msgid "Mo_ve to Folder..."
 msgstr "�_thelyez�s mapp�ba..."
 
-#: 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 "_M�sol�s mapp�ba..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 msgid "Add Sender to Address_book"
 msgstr "_Felad� hozz�ad�sa a c�mjegyz�khez"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 msgid "Appl_y Filters"
 msgstr "_Sz�r�k alkalmaz�sa"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 msgid "Crea_te Rule From Message"
 msgstr "S_zab�ly gy�rt�sa lev�lb�l"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 msgid "VFolder on M_ailing List"
 msgstr "VMappa a _levelez�list�ra"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "S_z�r� a levelez�list�ra (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "V_Mappa a levelez�list�ra (%s)"
@@ -11565,19 +11707,19 @@ msgstr "Nem adtad meg az �sszes sz�ks�ges inform�ci�t."
 msgid "Evolution Account Editor"
 msgstr "Evolution Postafi�k-szerkeszt�"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_G�p:"
 
-#: 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 "_Felhaszn�l�n�v:"
 
-#: 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 "�_tvonal:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Nem hozhatsz l�tre k�t egyez� nev� postafi�kot."
 
@@ -11594,14 +11736,14 @@ msgid "Really delete account?"
 msgstr "T�nyleg t�rl�d a postafi�kot?"
 
 #: 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 "Tilt�s"
 
 #: 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 "Enged�lyez�s"
 
@@ -11688,9 +11830,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 form�tum� levelet k�ldesz, de ezek a c�mzettek nem akarnak HTML "
 "form�tum� leveleket kapni:\n"
@@ -11733,7 +11876,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Meg kell adnod c�mzetteke, miel�tt elk�ldhetn�d a levelet."
 
-#: 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?"
@@ -11741,28 +11884,28 @@ msgstr ""
 "Nem siker�lt megnyitni az ehhez a postafi�khoz tartoz� piszkozatok mapp�t.\n"
 "Szeretn�d haszn�lni az alap�rtelmezett piszkozatok mapp�t?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "ismeretlen felad�"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Y-%m-%d, %a keltez�ssel %%s ezt �rta:"
 
-#: 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 "Lev�l(levelek) �thelyez�se m�s mapp�ba"
 
-#: 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 "Lev�l(levelek) m�sol�sa m�s mapp�ba"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "T�nyleg szerkeszteni szeretn�d mind a %d levelet?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11770,7 +11913,7 @@ msgstr ""
 "Csak a Piszkozatok mapp�ban l�v� \n"
 "leveleket lehet szerkeszteni."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11778,39 +11921,39 @@ msgstr ""
 "Csak az Elk�ld�tt mapp�ban l�v� \n"
 "leveleket lehet �jra elk�ldeni."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "T�nyleg �jra akarod k�ldeni mind a %d �zenetet?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Nincs lev�l kijel�lve"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Fel�l�rod a f�jlt?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Lev�l ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Levelek ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "A k�vetkez� olvasatlan lev�l megjelen�t�se"
 
-#: 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"
@@ -11822,7 +11965,7 @@ msgstr ""
 "\n"
 "T�nyleg t�rl�d ezeket a leveleket?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11831,63 +11974,63 @@ msgstr ""
 "Hiba a sz�r�inform�ci�k bet�lt�se k�zben:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Sz�r�k..."
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d oldal"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Lev�l nyomtat�sa"
 
-#: 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 "Lev�l nyomtat�sa sikertelen"
 
-#: 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 "T�nyleg k�l�n ablakban akarod megnyitni mind a %d levelet?"
 
-#: 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 "Nincs le�r�s"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 #, fuzzy
 msgid "Please specify a valid script name"
 msgstr "Meg kell adnod egy c�mkenevet"
 
-#: 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 "N�vtelen"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 msgid "en"
 msgstr "en"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Felt�tel hozz�ad�sa"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "_Al��r�s"
@@ -11946,16 +12089,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution Postafi�k var�zsl�"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr "%d. postafi�k"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Szolg�ltat�s ellen�rz�se"
 
-#: 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 "Kapcsol�d�s a kiszolg�l�hoz..."
 
@@ -12604,74 +12747,70 @@ msgstr "Nem siker�lt l�trehozni az S/MIME bor�t�k r�szt."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nem siker�lt l�trehozni az S/MIME dek�dol� r�szt."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Mell�klet ment�se"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nem siker�lt l�trehozni a '%s' ideiglenes f�jlt: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 msgid "Save Attachment..."
 msgstr "Mell�klet ment�se..."
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Megtekint�s be�gyazva"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Megnyit�s ezzel: %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Megtekint�s be�gyazva (%s seg�ts�g�vel)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Rejt�s"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "K�ls� n�z�ke"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 msgid "Downloading images"
 msgstr "K�pek let�lt�se"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "�zenet tartalm�nak bet�lt�se"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 msgid "Overdue:"
 msgstr "Lej�rt elemek:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%Y %B %d, %l:%M %P szerint"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr "a lehet� leghamarabb"
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "Hivatkoz�s megnyit�sa b�ng�sz�ben"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Hivatkoz�s hely�nek m�sol�sa"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Hivatkoz�s ment�se m�sk�nt (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "K�p ment�se m�sk�nt..."
 
@@ -12680,106 +12819,107 @@ msgstr "K�p ment�se m�sk�nt..."
 msgid "Pinging %s"
 msgstr "%s p�szt�z�sa"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s mell�klet"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nem siker�lt �rtelmezni a MIME-�zenetet. Megjelen�t�s forr�sk�nt."
 
-#: 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 "D�tum"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Rossz c�m"
 
-#: 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 "Felad�"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "V�laszc�m"
 
-#: 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 "C�mzett"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "M�solat"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Rejtett m�solat"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 msgid "Mailer"
 msgstr "Levelez�"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Az �zenetet digit�lisan al��rt�k. Tov�bbi inform�ci��rt kattints a lakat "
 "ikonra."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nem siker�lt l�trehozni a PGP ellen�rz�s r�szt."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Az �zenetet digit�lisan al��rt�k, �s az al��r�s hiteles."
 
-#: 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 "Az �zenetet digit�lisan al��rt�k, de nem bizony�that�, hogy hiteles."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mutat� FTP-helyre (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Mutat� helyi f�jlra (%s), amely \"%s\" helyen �rv�nyes"
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mutat� hely f�jlra (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Mutat� t�voli adatra (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mutat� ismeretlen k�ls� adatra (\"%s\" t�pus)"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Hib�s k�ls� t�rzsr�sz."
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, c-format
 msgid "Local folders/%s"
 msgstr "Helyi mapp�k/%s"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Mappa �jrabe�ll�t�sa"
 
-#: 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"
@@ -12788,27 +12928,22 @@ msgstr ""
 "Nem siker�lt elmenteni a mappa metainf�j�t, val�sz�n�leg nem tudod t�bb� "
 "megnyitni ezt mapp�t: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nem siker�lt menteni a mappa metainf�j�t %s-be: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nem siker�lt t�r�lni a mapp�t metaadatait: %s: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" mappa �talak�t�sa \"%s\" form�tumra"
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s-t be�ll�t�sait nem lehet megv�ltoztatni, mert az nem helyi mappa"
-
-#: 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."
@@ -12816,15 +12951,15 @@ msgstr ""
 "Ha nem tudod t�bb� megnyitni ezt a postafi�kot, \n"
 "akkor esetleg k�zzel kell megjav�tanod."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Nem v�ltoztathatod meg nem helyi mapp�k form�tum�t."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s �jrabe�ll�t�sa"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "Nem v�ltoztathatod meg nem helyi mapp�k form�tum�t."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13065,21 +13200,21 @@ msgstr "V�rakoz�s..."
 msgid "User canceled operation."
 msgstr "A felhaszn�l� megszak�totta a m�veletet."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Jelsz� megjegyz�se"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jelsz� megjegyz�se a munkafolyamat h�tralev� r�sz�re"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "�rd be %s jelszav�t"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "�rd be a jelsz�t"
 
@@ -13088,11 +13223,11 @@ msgstr "�rd be a jelsz�t"
 msgid "Could not save signature file: %s"
 msgstr "Nem siker�lt menteni az al��r�sf�jlt: %s"
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Al��r�s ment�se"
 
-#: 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"
@@ -13102,14 +13237,11 @@ msgstr ""
 "\n"
 "Akarod menteni a v�ltoz�saidat?"
 
-#: mail/mail-signature-editor.c:371
-#, fuzzy
-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 ""
-"�rd be azt a nevet, amellyel hivatkozni szeretn�l erre a postafi�kra.\n"
-"P�ld�ul: \"Munka\" vagy \"Otthon\""
 
-#: 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 "N�v:"
 
@@ -13149,7 +13281,7 @@ msgstr ""
 "    '%s'\n"
 "�s friss�tve lettek."
 
-#: 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 "VMapp�k"
 
@@ -13179,67 +13311,67 @@ msgstr "(Nincs t�rgy)"
 msgid "%s - Message"
 msgstr "%s - �zenet"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Nem n�zett"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "N�zett"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Megv�laszolt"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "T�bb l�thatatlan lev�l"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "T�bb lev�l"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Alacsonyabb"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Magasabb"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#: 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 "Ma %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Tegnap %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 "%Y %d %b"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "Lev�llista l�trehoz�sa"
 
@@ -13308,45 +13440,71 @@ msgstr "V�lasz mindenkinek"
 msgid "Review"
 msgstr "�tn�z�s"
 
-#: 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: _Z�szl� folytat�shoz..."
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "K�sz"
+
+#: 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 "_Z�szl� t�rl�se"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Esed�kes "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Megjel�lt"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Mapp�k p�szt�z�sa %s alatt \"%s\"-en"
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Gy�k�rszint� mapp�k p�szt�z�sa \"%s\"-en"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Feliratkoz�s \"%s\" mapp�ra"
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Leiratkoz�s \"%s\" mapp�r�l"
 
-#: 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 "Mappa"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 msgid "Scanning folders..."
 msgstr "Mapp�k p�szt�z�sa..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Nincs kiszolg�l� kiv�lasztva."
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "V�lassz egy kiszolg�l�t."
 
@@ -23248,12 +23406,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Nincs le�r�s"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "�sszefoglal� a levelekr�l"
 
-#: 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 "Helyi mapp�k"
 
@@ -23263,23 +23421,23 @@ msgstr "Helyi mapp�k"
 #. (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 "LHBP:LHSY"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com -- A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "�j h�rforr�s hozz�ad�sa"
 
-#: 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 "Add meg a hozz�adand� h�rforr�s URL-j�t"
 
@@ -23316,11 +23474,11 @@ msgstr "(Nincs le�r�s)"
 msgid "My Weather"
 msgstr "Id�j�r�s"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr "Hiba t�rt�nt az adatok let�lt�se k�zben:"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Id�j�r�s"
 
@@ -24644,6 +24802,11 @@ msgstr ""
 "Nem siker�lt �tvinni a mapp�t:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\"-ben ..."
+
 #: shell/e-folder-list.c:312
 msgid "Add a Folder"
 msgstr "Mappa hozz�ad�sa"
@@ -24880,12 +25043,25 @@ msgid "Rename folder"
 msgstr "Mappa �tnevez�se"
 
 #: 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 "A megadott mappan�v nem j�: %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 ""
+"Nem siker�lt �tnevezni a mapp�t:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -24894,12 +25070,12 @@ msgstr ""
 "Nem siker�lt elk�sz�teni a megadott mapp�t:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "�_j mappa l�trehoz�sa..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "�j..."
 
@@ -24929,20 +25105,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "V�laszd ki az inform�ci�t, amelyet import�lni szeretn�l:"
 
-#. 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 import�l�sa\n"
-"Az import�l� nem felel.\n"
-"Pr�b�lkoz�s 5 m�sodperc m�lva."
-
-#: 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"
@@ -24951,22 +25114,22 @@ msgstr ""
 "%s import�l�sa\n"
 "%d. elem import�l�sa."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "V�lassz mapp�t"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' f�jl nem l�tezik."
 
-#: 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 hiba"
 
-#: 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"
@@ -24975,11 +25138,11 @@ msgstr ""
 "Nincs olyan import�l�, amely k�pes lenne kezelni\n"
 "%s-t"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Import�l�s folyamatban"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24988,17 +25151,17 @@ msgstr ""
 "%s import�l�sa.\n"
 "%s ind�t�sa"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Hiba %s ind�t�sakor"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Hiba %s bet�lt�sekor"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25007,31 +25170,31 @@ msgstr ""
 "%s import�l�sa\n"
 "1. elem import�l�sa."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "F�jln�v:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "V�lassz egy f�jlt"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "F�jlt�pus:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Adatok �s be�ll�t�sok import�l�sa kor�bbi programokb�l"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Egyetlen f�jl import�l�sa"
 
-#: 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"
@@ -25039,24 +25202,24 @@ msgstr ""
 "V�rj...\n"
 "Megl�v� be�ll�t�sok keres�se"
 
-#: 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 "Az okos import�l�k ind�t�sa"
 
-#: 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 "Felad� %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "V�lassz mapp�t"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "V�laszd ki az import�l�land� adatok c�lk�nyvt�r�t"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import�l�s"
 
@@ -25083,30 +25246,30 @@ msgstr "Mappa szinkroniz�l�sa"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "\"%s\" szinkroniz�l�sa (%d / %d)"
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Az Evolution be�ll�t�sai"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 msgid "Opening Folder"
 msgstr "Mappa megnyit�sa"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Mappa megnyit�sa: \"%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 "\"%s\"-ben ..."
 
-#: 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 "Nem siker�lt �tnevezni ezt a mapp�t: %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 "A megadott megosztott mappa nem nyithat� meg."
@@ -25147,44 +25310,44 @@ msgstr "A mappa neve nem tartalmazhat '/' jelet."
 msgid "'.' and '..' are reserved folder names."
 msgstr "A '.' �s a '..' fenntartott mappanevek."
 
-#: 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 nem tal�lhat� a $PATH-odban."
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Nem siker�lt futtatni a Bug buddy-t."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "A Ximian Evolution n�vjegye"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Ugr�s mapp�ba..."
 
-#: 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�laszd ki a megnyitand� mapp�t"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "�j ind�t�ikon l�trehoz�sa"
 
-#: 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�laszd ki az ind�t�ikon c�lpontj�t k�pez� mapp�t:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "_Munka a h�l�zatban"
 
-#: 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 "K_apcsolat n�lk�li munka"
 
-#: 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 "Kapcsolat n�lk�li munka"
 
@@ -25192,27 +25355,27 @@ msgstr "Kapcsolat n�lk�li munka"
 msgid "(No folder displayed)"
 msgstr "(Nem jelen�thet� meg a mappa)"
 
-#: 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 "(semmi)"
 
-#: 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 ""
 "A Ximian Evolution a h�l�zatban van. Kattints erre a gombra a kapcsolat "
 "n�lk�li munk�hoz."
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "A Ximian Evolution felk�sz�l a kapcsolat n�lk�li munk�ra."
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25230,12 +25393,12 @@ msgstr ""
 "Az aktiv�l�rendszer �ltal adott hiba:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nem siker�lt be�ll�tani a helyi t�rter�letet -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25246,19 +25409,19 @@ msgstr ""
 "v�ratlanul kil�pett. Ki kell l�pned az Evolutionb�l, �s �jra\n"
 "el kell ind�tanod, hogy ism�t el�rhesd az adataidat."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "�rv�nytelen argumentumok"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Nem siker�lt regisztr�lni az OAF-ban"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "A be�ll�t�sok adatb�zisa nem tal�lhat�"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "�ltal�nos hiba"
 
@@ -25397,58 +25560,62 @@ msgstr "Ind�t�ikonok"
 msgid "Checkbox"
 msgstr "Jel�l�n�gyzet"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Nincs hiba"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "A megadott n�ven m�r l�tezik mappa"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "A megadott mappat�pus nem j�"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "I/O hiba"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Nincs el�g hely a mappa elk�sz�t�s�hez"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "A mappa nem �res."
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "A megadott mappa nem tal�lhat�"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "A funkci� nincs m�g ebben a t�rol�ban meg�rva"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "A m�velet nem t�mogatott"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "A megadott mappa nem m�dos�that� vagy t�r�lhet�"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nem lehet a mapp�t a saj�t almapp�j�ba �thelyezni."
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Nem k�nyvt�rat l�trehozni ezen a n�ven"
 
+#: 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 (...)"
@@ -25660,9 +25827,10 @@ msgstr ""
 "A folytat�shoz kattints a \"Tov�bb\" gombra."
 
 #: 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 ""
@@ -25680,26 +25848,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolution import�l� var�zsl�"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution import�l� var�zsl�"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "F�jl import�l�sa (3/3 l�p�s)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Import�l�t�pus (1/3 l�p�s)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "V�lassz import�l�t (2/3 l�p�s)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "V�lassz egy f�jlt (2/3 l�p�s)"
 
-#: 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"
@@ -25921,10 +26085,10 @@ msgstr "N�vjegy megtekint�se"
 #: 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 "_M�veletek"
 
@@ -26042,7 +26206,7 @@ msgid "Print this item"
 msgstr "Elem nyomtat�sa"
 
 #: 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 "Ment�s"
 
@@ -26069,7 +26233,7 @@ msgstr "Elem ment�se lemezre"
 #: 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 "_F�jl"
 
@@ -26151,7 +26315,8 @@ msgid "Schedule a meeting for this item"
 msgstr "�rtekezlet tervez�se ehhez az elemhez"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "A Saj�t Evolution testreszab�sa"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26199,29 +26364,30 @@ msgid "Post a message to a Public folder"
 msgstr "�zenet k�ld�se egy nyilv�nos mapp�ba"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Feliratkoz�s mapp�kra..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Lev�lbetekint�-ablak megjelen�t�se"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Feliratkoz�s �s leiratkoz�s t�voli kiszolg�l�k mapp�ira"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "Virtu�lis mapp�k szerkeszt�je..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Sz�r�k..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_Betekint� ablakt�bla"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_Feliratkoz�s mapp�kra..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Mappa tulajdons�gainak megv�ltoztat�sa"
@@ -26318,7 +26484,7 @@ msgstr "T�ma szerinti lev�llista"
 msgid "_Expunge"
 msgstr "_Tiszt�t�s"
 
-#: 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 "_Mappa"
 
@@ -26625,7 +26791,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Sz�veg keres�se a megjelen�tett lev�l t�rzs�ben"
 
 #: 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 "Oldalbe�ll�t�s az aktu�lis nyomtat�hoz"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26732,7 +26899,7 @@ msgstr "_Id�zetk�nt"
 msgid "_Resend..."
 msgstr "_�jrak�ld�s..."
 
-#: 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 "_Eszk�z�k"
 
@@ -26747,12 +26914,12 @@ msgstr "Ablak bez�r�sa"
 #: 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 "_Bez�r�s"
 
 #: 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�zet"
 
@@ -26925,7 +27092,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Az elem ment�se �s a p�rbesz�dablak bez�r�sa"
 
-#: 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 "_S�g�"
 
@@ -27086,7 +27253,8 @@ msgid "Open Other _User's Folder..."
 msgstr "_M�s felhaszn�l� mapp�j�nak megnyit�sa..."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+#, fuzzy
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 "Egy olyan mappa megnyit�sa, amelyet egy m�sik felhaszn�l� el�rhet�v� tett a "
 "kiszolg�l�n"
@@ -27104,110 +27272,131 @@ msgid "Pi_lot Settings..."
 msgstr "_Pilot be�ll�t�sai..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Pilot be�ll�t�sai..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "M�s felhaszn�l� mapp�j�nak megnyit�sa"
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "K�ld�s / Fogad�s"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Send queued items and retrieve new items"
 msgstr "V�rakoz� elemek elk�ld�se �s az �j elemek let�lt�se"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "A Pilot be�ll�t�sa"
+
+#: ui/evolution.xml.h:32
 msgid "Set up Pilot configuration"
 msgstr "A Pilot be�ll�t�sa"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "A Ximian Evolutionnel kapcsolatos inform�ci�k megjelen�t�se"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Hibajelent�s bek�ld�se"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "_Hibajelent�s bek�ld�se"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Hibajelent�s bek�ld�se a Bug Buddy seg�ts�g�vel."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "V�lt�s"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Mutassa-e a mappas�vot"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mutassa-e ind�t�s�vot"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "V�lt�s kapcsolat n�lk�li munk�ra"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "A kijel�lt mapp�k megtekint�se"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _GYIK"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "A Ximian Evolution _n�vjegye..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_M�sol�s..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Mappas�v"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 msgid "_Folder..."
 msgstr "_Mappa..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "Mapp�ra _ugr�s..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Import�l�s..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "�_thelyez�s..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "�_j"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "�j _mappa"
 
-#: ui/evolution.xml.h:56
-msgid "_Preferences..."
-msgstr "_Be�ll�t�sok..."
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Remove Other User's Folder"
+msgstr "M�s felhaszn�l� mapp�j�nak megnyit�sa"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "�_tnevez�s..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_K�ld�s / Fogad�s"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Levelez� be�ll�t�sai"
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Ind�t�s�v"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 msgid "_Shortcut..."
 msgstr "_Ind�t�ikon..."
 
@@ -27438,11 +27627,11 @@ msgstr "Karakterk�dol�s"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Keres�sszerkeszt�"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Keres�s ment�se"
 
@@ -27517,18 +27706,65 @@ msgstr "init_corba(): nem siker�lt a GNOME inicializ�l�sa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 
+#~ msgid "&lt;- _Remove"
+#~ msgstr "&lt;- _T�rl�s"
+
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Hozz�ad�s -&gt;"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "�j levelek keres�se"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "A mappa nem �res."
+
+#~ msgid "1 byte"
+#~ msgstr "1 b�jt"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u b�jt"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Elfelejtett�l mapp�t v�lasztani.\n"
+#~ "L�pj vissza, �s adj meg egy �rv�nyes mappanevet, ahov� a leveleket k�red."
+
+#~ msgid "at your earliest convenience"
+#~ msgstr "a lehet� leghamarabb"
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s-t be�ll�t�sait nem lehet megv�ltoztatni, mert az nem helyi mappa"
+
+#, fuzzy
+#~ msgid "Type the name by which you would like to refer to this signature."
+#~ msgstr ""
+#~ "�rd be azt a nevet, amellyel hivatkozni szeretn�l erre a postafi�kra.\n"
+#~ "P�ld�ul: \"Munka\" vagy \"Otthon\""
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "%s import�l�sa\n"
+#~ "Az import�l� nem felel.\n"
+#~ "Pr�b�lkoz�s 5 m�sodperc m�lva."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolution import�l� var�zsl�"
+
+#~ msgid "_Preferences..."
+#~ msgstr "_Be�ll�t�sok..."
+
 #~ msgid "Could not parse query string"
 #~ msgstr "Nem siker�lt �rtelmezni a lek�rdez�st"
 
 #~ msgid "Email is"
 #~ msgstr "Email ="
 
-#~ msgid "<- _Remove"
-#~ msgstr "<- _T�rl�s"
-
-#~ msgid "_Add ->"
-#~ msgstr "Hozz�_ad�s ->"
-
 #~ msgid "This page can be used to configure Calendar and Task preferences"
 #~ msgstr "Ezen a lapon �ll�thatod be a Napt�r �s a Feladatok be�ll�t�sait."
 
@@ -27608,15 +27844,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Non-Participants"
 #~ msgstr "Nem vesz r�szt"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "A lev�l nem lett elk�ldve.\n"
-#~ "\n"
-#~ "Akarod menteni a v�ltoz�saidat?"
-
 #~ msgid " _Refresh List "
 #~ msgstr "_Lista friss�t�se"
 
@@ -28572,9 +28799,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "_Task..."
 #~ msgstr "_Feladat..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Levelez� be�ll�t�sai"
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Tov�bb�t�s _mell�kletk�nt"
 
@@ -28614,12 +28838,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Email contains"
 #~ msgstr "Az emailc�m tartalmazza"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Szabad/foglalt inform�ci� (%s - %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "iCalendar inform�ci�"
-
 #~ msgid "�F"
 #~ msgstr "�F"
 
diff --git a/po/it.po b/po/it.po
index 94021c832e..e2077e1669 100644
--- a/po/it.po
+++ b/po/it.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: 2002-03-13 12:27+01:00\n"
 "Last-Translator: Clara Tattoni  <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -318,11 +318,17 @@ msgstr "Cognome"
 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 di Contatti senza nome"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "VCard  Multiple"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard per %s"
@@ -333,47 +339,47 @@ msgstr "VCard per %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 "Impossibile inizializzare 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 "Ricerca in corso..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Connessione al server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Aggiunta di una card al server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Rimozione di una card dal server LDAP in corso..."
 
-#: 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 "Modifica di una card nel server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Ricezione dei risultati della ricerca LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Errore nella rimozione di una card"
@@ -391,13 +397,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook non caricato\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 "Impossibile avviare il server 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 "Impossibile avviare wombat"
@@ -464,10 +470,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Fabbrica per il controllo degli esempi della Rubrica"
 
 #: 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 "Contatti"
@@ -484,28 +490,38 @@ msgstr "LDAP Server"
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP contenente le informazioni dei contatti"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Contatti"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Cartella contenente le informazioni dei contatti"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Nuovo Contatto"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crea un nuovo contatto"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Nuova Lista di Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "Lista dei _Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crea una nuova lista di contatti"
@@ -554,7 +570,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL non � supportato in questa compilazione di 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 "Impossibile inizializzare gnome-vfs"
 
@@ -562,11 +578,11 @@ msgstr "Impossibile inizializzare gnome-vfs"
 msgid "Other Contacts"
 msgstr "Altri Contatti"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubruca"
 
-#: 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 ""
 "Impossibile aprire questa rubrica. Controllare che \n"
 "il percorso esista e che si abbia il permesso di accedervi."
 
-#: 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 ""
 "che � stata inserita una URI errata,\n"
 "oppure che il server LDAP non funziona"
 
-#: 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 ""
 "bisogna compilare il programma dai sorgenti CVS dopo\n"
 "aver scaricato Open LDAP dal link sottostante.\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 ""
 "che � stata inserita una URI errata,\n"
 "oppure che il server LDAP non funziona"
 
-#: 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 ""
+"Non in grado di autenticare al server 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 "Digitare la password per %s (utente %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "finisce per"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "finisce per"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "La categoria �"
 
 #. 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 "Qualunque campo contiene"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Avanzato..."
 
-#: 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 "Qualunque Categoria"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI visualizzata dal Browser delle cartelle"
 
@@ -740,53 +769,53 @@ msgid "  S_how Supported Bases "
 msgstr "_Controlla tipi supportati"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Opzioni"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "_Rimuovere"
-
-#: 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 "Rimuovere"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opzioni"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -926,50 +955,56 @@ 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 "Predefiniti"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Predefiniti"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "_Scopo della Ricerca:"
 
 #. 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 "Ricerca in corso"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Seleziona Tutto"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Eliminato"
 
-#: 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"
@@ -980,7 +1015,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"
@@ -989,47 +1024,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 "Informazione Sorgenti"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Connessione al 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 "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Schema non supportato"
 
-#: 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"
@@ -1037,7 +1072,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"
@@ -1046,7 +1081,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"
@@ -1054,7 +1089,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"
@@ -1064,7 +1099,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"
@@ -1074,13 +1109,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 "
@@ -1090,7 +1125,7 @@ msgstr ""
 "Questo � il numero massimo di card da scaricare. L'impostazione di un valore "
 "troppo grande rallenter� questa rubrica."
 
-#: 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 "
@@ -1100,7 +1135,7 @@ msgstr ""
 "impostare questo come \"Indirizzo Email\" richiede accesso anonimo al server "
 "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 "
@@ -1110,7 +1145,7 @@ msgstr ""
 "Questo nome viene usato per identificare il vostro account.  Serve solo allo "
 "scopo di visualizzarlo."
 
-#: 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"
@@ -1118,11 +1153,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"
@@ -1131,26 +1166,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 "Nome Distintivo (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "Indirizzo Email"
 
-#: 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
@@ -1158,50 +1193,50 @@ msgstr ""
 msgid "_Add"
 msgstr "_Aggiungi"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_Aggiungi"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Aggiungi Azione"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Aggiungi Azione"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Avvisi Sonoro"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Elimina tutti"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Visualizzazione"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Nome Distintivo (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
 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
@@ -1211,103 +1246,103 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Modifica appuntamenti"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Avviso 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 "_Opzioni"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Predefiniti"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base della Ricerca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "Nome del _Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Suoneria (minuti)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Account %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "Editor della lista dei Contatti"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Nessuna card"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Riconnessione a %s in corso"
 
-#: 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 "Generale"
 
-#: 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 "Ricerca in corso"
@@ -1322,8 +1357,8 @@ msgstr "Fabbrica per l'interfaccia di selezione dei nomi della Rubrica"
 
 #. 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"
@@ -1354,11 +1389,11 @@ msgstr "(%d non mostrati)"
 msgid "Unnamed Contact"
 msgstr "Contatto senza nome"
 
-#: 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 "Seleziona Contatti dalla Rubrica"
 
-#: 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 "Il mittente contiene"
@@ -1432,7 +1467,7 @@ msgid "D_epartment:"
 msgstr "_Dipartimento:"
 
 #: 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 "Dettagli"
 
@@ -1491,13 +1526,13 @@ msgstr "Vuole ricevere messaggi in _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 "_Elimina"
 
@@ -1525,1024 +1560,1024 @@ msgstr "URL Calendario _Pubblico:"
 msgid "_Web page address:"
 msgstr "Indirizzo pagina _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 "Stati Uniti d'America"
 
-#: 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 "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 "Algeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "American 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 "Antartide"
 
-#: 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 e 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 "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 "Banglades"
 
-#: 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 "Belarus"
 
-#: 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 "Belgio"
 
-#: 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 Erzegovina"
 
-#: 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 "Isola 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 "Brasile"
 
-#: 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 "Territori Britannici dell'Oceano Indiano"
 
-#: 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 "Cambogia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Cameroon"
 
-#: 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 "Capo 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 "Isole Caimane"
 
-#: 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 "Repubblica Centro 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 "Cile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Cina"
 
-#: 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 "Isole di Natale"
 
-#: 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 "Isole Coco (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 "Comorre"
 
-#: 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 "Isole 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 d'Avorio"
 
-#: 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 "Croazia"
 
-#: 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 "Cipro"
 
-#: 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 "Repubblica Ceca"
 
-#: 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 "danimarca"
 
-#: 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 "Repubblica 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 "East 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 "Egitto"
 
-#: 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 Equatoriale"
 
-#: 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 "Isole Falkland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Isole Faroe"
 
-#: 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 "Guiana francese"
 
-#: 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 francese"
 
-#: 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 "Territori Francesi Meridionali"
 
-#: 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 "Germania"
 
-#: 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 "Gibilterra"
 
-#: 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 "Canada"
 
-#: 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 "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 "Isole Heard e 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 "Ungheria"
 
-#: 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 "Islanda"
 
-#: 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 "Israele"
 
-#: 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 "Giappone"
 
-#: 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 "Giordania"
 
-#: 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 "Corea, Repubblica della"
 
-#: 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 "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 "Lussemburgo"
 
-#: 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 "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 "Malesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Maldive"
 
-#: 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 "Isole 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 "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 "Messico"
 
-#: 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
 msgid "Moldova, Republic Of"
 msgstr "Moldova, Repubblica della"
 
-#: 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 "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 "Marocco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mozambico"
 
-#: 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 "Olanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Antille Olandesi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Nuova 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 "Nuova 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 "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 "Isole 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 "Isole Mariana Settentrionali"
 
-#: 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 "Territorio Palestinese"
 
-#: 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 Nuova 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 "Filippine"
 
-#: 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 "Portogallo"
 
-#: 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 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 "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 "Federazione Russa"
 
-#: 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 e 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 "Saint Vincent e  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 "Sao Tome And 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 "Arabia Saudita"
 
-#: 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 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 "Slovacchia"
 
-#: 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 "Slovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Isole Solomon"
 
-#: 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 Africa"
 
-#: 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 Sud e Isole Sandwich meridionali"
 
-#: 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 "Spagna"
 
-#: 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 "S. Elena"
 
-#: 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 e 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 "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 "Isole Svalbard e 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 "Svezia"
 
-#: 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 "Svizzera"
 
-#: 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, Repubbliche Unite della"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: 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 e 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 "Turchia"
 
-#: 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 "Isole Turks e 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 "Ucraina"
 
-#: 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 "Emirati Arabi Uniti"
 
-#: 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 "Gran Bretagna"
 
-#: 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 "Viet Nam"
 
-#: 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 "Isole Vergini Britanniche"
 
-#: 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 "Isole Vergini U.S.A"
 
-#: 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 "Isole Wallis e 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 occidentale"
 
-#: 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 "Iugoslavia"
 
-#: 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"
 
@@ -2579,20 +2614,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Impossibile trovare il widget per un 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 "Aggiunta veloce di un Contatto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Modifica Interamente"
 
-#: 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 "Nome e cognome"
 
-#: 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"
 
@@ -2614,6 +2649,19 @@ msgstr ""
 "%s esiste gi�\n"
 "Sovrascriverlo?"
 
+#: 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 "Sovrascrivere il file?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Indirizzo _2:"
@@ -2745,7 +2793,7 @@ msgstr "Editor della lista dei Contatti"
 msgid "Contact List Editor"
 msgstr "Editor della Lista dei Contatti"
 
-#: 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 "Salva Lista come VCard"
 
@@ -2795,7 +2843,7 @@ msgstr ""
 " gi� in questa cartella. Aggiungere comunque?"
 
 #: 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 "Ricerca Avanzata"
 
@@ -2804,25 +2852,25 @@ msgstr "Ricerca Avanzata"
 msgid "Search"
 msgstr "Cerca"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Nessuna card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Errore nell'avvio di %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"
@@ -2834,10 +2882,10 @@ msgid "Success"
 msgstr "Completato"
 
 #: 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 sconosciuto"
 
@@ -2845,7 +2893,7 @@ msgstr "Errore sconosciuto"
 msgid "Repository offline"
 msgstr "Deposito non in linea"
 
-#: 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 "Permesso negato"
@@ -2866,8 +2914,8 @@ msgstr "Protocollo non supportato"
 #: 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 "Annullato"
 
@@ -2918,7 +2966,7 @@ msgstr "Errore nella rimozione della 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 "Errore nella rimozione di una card"
 
@@ -2931,11 +2979,10 @@ msgid "Display Cards"
 msgstr "Mostra Card"
 
 #: 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 ""
 "Si � richiesto che %d cars siano card.  Questo causa la visualizzazione di %"
 "d nuove finestre\n"
@@ -3028,7 +3075,7 @@ msgstr "Rubrica"
 
 #: 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 "Salva come VCard"
@@ -3114,7 +3161,7 @@ msgstr "Copia"
 msgid "Paste"
 msgstr "Incolla"
 
-#: 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
@@ -3122,8 +3169,8 @@ msgstr "Incolla"
 msgid "Delete"
 msgstr "Elimina"
 
-#: 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 _Corrente"
@@ -3132,7 +3179,7 @@ msgstr "Vista _Corrente"
 #. 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"
 
@@ -3140,11 +3187,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"
@@ -3276,7 +3323,7 @@ msgid "Include:"
 msgstr "Includi:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Orizzontale"
 
@@ -3301,7 +3348,7 @@ msgid "Options"
 msgstr "Opzioni"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientazione"
 
@@ -3324,7 +3371,7 @@ msgstr "Alimentazione della carta:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Verticale"
 
@@ -3386,20 +3433,20 @@ msgstr "Appuntamento senza titolo"
 
 #: 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 "Altezza"
 
 #: 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 "Normale"
 
 #: 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 "Basso"
 
@@ -3410,13 +3457,17 @@ msgstr "Basso"
 msgid "Undefined"
 msgstr "Non definito"
 
-#: 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 "Errore durante la comunicazione con il server del 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 "Impossibile leggere il blocco di applicazione del Calendario"
 
@@ -3529,11 +3580,11 @@ msgstr "Suoneria (minuti)"
 msgid "_Edit appointment"
 msgstr "_Modifica appuntamenti"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Nessuna descrizione disponibile."
 
-#: 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"
@@ -3545,13 +3596,13 @@ msgstr ""
 "richiede l'invio di un messaggio di posta elettronica.  Per questo,\n"
 "Evolution visualizzer� invece un messaggio a video."
 
-#: 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 "Attenzine"
 
-#: 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 "
@@ -3568,15 +3619,15 @@ msgstr ""
 "\n"
 "Si vuole davvero eseguire questo programma?"
 
-#: 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 "Non chiedere pi� su questo programma in futuro."
 
-#: 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 "Impossibile inizializzare 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 ""
 "Impossibile creare la babbrica per il servizio di notifica dell'avviso sonoro"
@@ -3626,7 +3677,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 ""
@@ -3705,9 +3756,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
@@ -3724,13 +3775,13 @@ msgid "Assigned"
 msgstr "Assegnato"
 
 #: 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 "S�"
 
 #: 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"
 
@@ -3750,76 +3801,96 @@ msgstr "Vista Settimanale"
 msgid "Month View"
 msgstr "Vista Mensile"
 
-#: 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 "Calendario"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Cartella contenente appuntamenti ed eventi"
 
-#: 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 Calendario _Pubblico:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Cartella contenente appuntamenti ed eventi"
+
+#: 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 "Attivit�"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Cartella contente le cose da fare"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Stampa card"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Cartella contente le cose da fare"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "Nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "_Appuntamento"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "_Riunione"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 msgid "Create a new meeting request"
 msgstr "Crea una nuova richiesta di apppuntamento"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Nuova attivit�"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Attivit�"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Crea una nuova attivit�"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Appuntamento"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crea un nuovo appuntamento"
@@ -3863,30 +3934,31 @@ msgid "Alarm Repeat"
 msgstr "Ripeti avviso"
 
 #: 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 ""
+"Questo � un avvertimento di posta elettronica, ma Evolution al momento non "
+"supporta questo tipo di avvertimenti.  Per questo non sar� possibile "
+"modificare le impostazioni di questo avvertimento."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Messaggio da visualizzare"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Emetti un suono:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Ripeti l'avviso"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Esegui programma:"
 
-#: 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 ""
-"Questo � un avvertimento di posta elettronica, ma Evolution al momento non "
-"supporta questo tipo di avvertimenti.  Per questo non sar� possibile "
-"modificare le impostazioni di questo avvertimento."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Con questi argomenti:"
@@ -3910,110 +3982,110 @@ msgstr "Ore"
 msgid "minutes"
 msgstr "minuti"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d giorni"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 giorno"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d settimane"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 settimana"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d ore"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 ora"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuti"
 
-#: 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 secondi"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 secondo"
 
-#: 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 "Emetti un suono"
 
-#: 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 "Visualizza un messaggio"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Invia un 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 "Esegui programma"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Azione sconosciuta"
 
-#: 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 prima dell'inizio dell'appuntamento"
 
-#: 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 dopo l'inizio dell'appuntamento"
 
-#: 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 all'inizio dell'appuntamento"
 
-#: 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 prima della fine dell'appuntamento"
 
-#: 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 dopo la fine dell'appuntamento"
 
-#: 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 alla fine dell'appuntamento"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s alle %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 per un'attivazione di tipo sconosciuto"
@@ -4034,7 +4106,7 @@ msgstr "Promemoria"
 
 #: 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 "Indice:"
 
@@ -4117,7 +4189,7 @@ msgid "Days"
 msgstr "Giorni"
 
 #: 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 "Venerdi"
 
@@ -4130,7 +4202,7 @@ msgid "Minutes"
 msgstr "Minuti"
 
 #: 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 "Lunedi"
 
@@ -4140,7 +4212,7 @@ msgid "S_un"
 msgstr "D_om"
 
 #: 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 "Sabato"
 
@@ -4153,7 +4225,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostra i _numeri delle settimane"
 
 #: 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 "Domenica"
 
@@ -4172,7 +4244,7 @@ msgid "Task List"
 msgstr "_Lista Attivit�"
 
 #: 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 "Giovedi"
 
@@ -4189,7 +4261,7 @@ msgid "Time format:"
 msgstr "Formato dell'ora:"
 
 #: 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 "Martedi"
 
@@ -4198,7 +4270,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 "Mercoledi"
 
@@ -4426,8 +4498,8 @@ msgid "No summary"
 msgstr "Nessuna descrizione"
 
 #: 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 "Salva come..."
 
@@ -4496,27 +4568,27 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Inserire Delegato"
 
-#: 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 "Appuntamento"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Promemoria"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
-#: 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 "Pianificazione"
 
-#: 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 "Riunione"
 
@@ -4585,19 +4657,19 @@ msgstr "Ora di _fine:"
 msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "� richiesto un organizzatore."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "� richiesto almeno un partecipante."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Questa persona sta gi� partecipando alla riunione!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Delega a..."
 
@@ -4637,7 +4709,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: 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"
@@ -4649,7 +4721,7 @@ msgstr "Ruolo"
 
 #: 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 "Stato"
@@ -4726,48 +4798,48 @@ msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Questo appuntamento contiene ricorrenze che Evolution non pu� modificare."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "il"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "lista"
 
-#: 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 "secondo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Altro"
 
-#: 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 "lista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Altro 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 "giorno"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "il"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "ricorrenze"
 
@@ -4863,7 +4935,7 @@ msgstr "Completato in 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 "Richiede Azione"
 
@@ -4872,7 +4944,7 @@ msgid "Progress"
 msgstr "In corso"
 
 #: 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�:"
 msgid "_Status:"
 msgstr "_Stato:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Di base"
 
-#: 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 "Assegnato"
 
-#: 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 "Rimozione degli elementi selezionati in corso"
 
-#: 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 "_Apri"
@@ -4979,30 +5051,30 @@ msgstr "_Apri"
 msgid "_Save as..."
 msgstr "Salva come..."
 
-#: 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_tampa..."
 
-#: 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 "_Taglia"
 
-#: 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 "_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
 msgid "_Paste"
@@ -5031,12 +5103,12 @@ msgstr "_Marka Attivit� Come Complete"
 msgid "_Delete Selected Tasks"
 msgstr "_Elimina le Attivit� Selezionate"
 
-#: 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 "Aggiornamento elementi in corso"
 
-#: 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 "Fare clic qui per aggiungere un'attivit�"
@@ -5045,8 +5117,8 @@ msgstr "Fare clic qui per aggiungere un'attivit�"
 msgid "Alarms"
 msgstr "Avvisi Sonoro"
 
-#: 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 "Completato"
 
@@ -5075,7 +5147,7 @@ msgid "Start Date"
 msgstr "Inizio"
 
 #: 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 "Sommario"
@@ -5142,451 +5214,457 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Nuovo _Appuntamento"
 
-#: 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 "Nuovo _Evento del Giorno"
 
-#: 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 "Nuova riunione"
 
-#: 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 "Nuova Attivit�"
 
-#: 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 "Stampa..."
 
-#: 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 "Vai a _Oggi"
 
-#: 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 "_Vai alla 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
 msgid "_Publish Free/Busy Information"
 msgstr "_Rende note le Informazioni sulla Disponibilit�"
 
-#: 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 "Configura %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 "Configura %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 "_Salva con Nome..."
 
-#: 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 "Pianifica una _Riunione"
 
-#: 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 "Inoltra come 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 "_Rendi rimandabile questa Ricorrenza"
 
-#: 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 "_Elimina questa Ricorrenza"
 
-#: 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 "Elimina _Tutte le Ricorrenze"
 
-#: 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 ""
 "I tool di GNOME Pilot non sembrano essere installati in questo 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 "Errore nell'esecuzione di %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 "Fine: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completato "
 
-#: 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 "Informazioni iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "Errore 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 "Partecipante sconosciuto"
 
 #. 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> Controllate queste informazioni, e poi selezionate un'azione dal menu."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Nessuno</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "Posizione _Geografica:"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "Stato:"
 
-#: 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 "Accettata"
 
-#: 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 "Accettato con tentativo"
 
-#: 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 "Annullato"
 
-#: 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 "Sconosciuto"
 
-#: 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 "Specificare un'operazione:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Aggiornare"
 
-#: 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 "Accettare"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Accettare con tentativo"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Rifiutare"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Invia Informazioni sulla Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Aggiorna stato risposta"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Invia Informazioni Correnti"
 
-#: 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 "Annulla"
 
-#: 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 pubblicato informazioni riguardo una riunione."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Dettagli della Riunione"
 
-#: 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> richiede la tua presenza ad una riunione."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Proposta di Riunione"
 
-#: 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> vuole aggiungersi ad una riunione esistente."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Aggiornamento Riunione"
 
-#: 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> vuole ricevere informazioni aggiornate sulla riunione."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Richiesta di Aggiornamento sulla Riunione"
 
-#: 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 risposto ad una richiesta di riunione."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Risposta ad una Riunione"
 
-#: 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 annullato una riunione."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Annullamento Riunione"
 
-#: 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 mandato un messaggio indecifrabile."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Messaggio di Richiesta Riunione Non Valido"
 
-#: 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 pubblicato informazioni sulle proprie attivit�."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Informazioni sull'Attivit�"
 
-#: 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> ha richiesto che venga eseguito un compito."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Proposta di Attivit�"
 
-#: 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> vuole aggiungere informazioni ad una attivit� esistente."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Aggiornamento Attivit�"
 
-#: 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> vuole ricevere informazioni aggiornate sull'attivit�."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Richiesta di Aggiornamento dell'Attivit�"
 
-#: 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 risposto all'assegnamento di un compito."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Risposta all'Attivit�"
 
-#: 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 annullato un'attivit�."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Annullamento Attivit�"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Messaggio di Attivit� Indecifrabile"
 
-#: 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 pubblicato informazioni sulla disponibilit�."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Informazioni sulla Disponibilit�"
 
-#: 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> richiede informazioni sulla disponibilit�."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Richiesta Disponibilit�"
 
-#: 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 risposto a una richiesta di disponibilit�."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Risposta Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Messaggio di Disponibilit� Indecifrabile"
 
-#: 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 cartella appare irrimediabilmente corrotta."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Il messaggio contiene solo richieste di tipo non supportato."
 
-#: 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'allegato non contiene un messaggio di calendario valido"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "L'allegato non ha nessun elemento di calendario visibile"
 
-#: 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 "Si � verificato un errore nella ricezione dei dati da"
 
-#: 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'elemento non pu� essere spedito!\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 "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Aggiornamento completato\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Impossibile aggiornare il file di calendario!\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 ""
 "Impossibile aggiornare lo stato del partecipante; l'elemento non esiste pi�"
 
-#: 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 ""
 "Impossibile aggiornare lo stato del partecipante; lo stato non � valido!\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 "Impossibile aprire la cartella in `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Stato del partecipante aggiornato\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Impossibile aggiornare lo stato del partecipante!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Rimozione Completata"
 
-#: 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 Spedito!\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'elemento non pu� essere spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Scegli Cartella"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Scegli Cartella"
@@ -5632,7 +5710,7 @@ msgstr "inizio"
 msgid "Chair Persons"
 msgstr "Moderatori"
 
-#: 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 "Partecipanti Richiesti"
 
@@ -5646,52 +5724,52 @@ msgid "Resources"
 msgstr "Risorse"
 
 #: 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 "Individuale"
 
 #: 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 "Gruppo"
 
 #: 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 "Risorse"
 
 #: 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 "Stanza"
 
 #: 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 "Moderatore"
 
 #: 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 "Partecipante Richiesto"
 
 #: 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 "Partecipante Opzionale"
 
 #: 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 Partecipante"
 
 #: 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 "Tentativo"
 
 #: 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 "Delegato"
 
@@ -5781,42 +5859,49 @@ msgstr "_Inizio appuntamento ore:"
 msgid "Meeting _end time:"
 msgstr "T_ermine dell' appuntamento ore:"
 
-#: 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 "Apertura attivit� %s in corso"
 
-#: 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 "Impossibile caricare le attivit� in `%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 "Il metodo richiesto per caricare `%s' non � supportato"
 
-#: 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 "Impossibile aprire la cartella in `%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 "Errore nell'avvio di %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Ultimato il"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Rimozione degli elementi selezionati in corso"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Eliminazione"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Nuovo _Appuntamento..."
 
@@ -5830,7 +5915,13 @@ msgstr "Impossibile aprire la cartella in `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Il metodo richiesto per aprire `%s' non � supportato"
 
-#: 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 "Allarme: %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5838,7 +5929,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"
@@ -5846,12 +5937,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 "Apertura calendario %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Lettura cartella %s in corso"
@@ -5912,49 +6003,58 @@ msgstr "Ottobre"
 msgid "September"
 msgstr "Settembre"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "� richiesto almeno un partecipante"
-
-#: 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 "� necessario impostare un organizer."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "� richiesto almeno un partecipante"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Informazioni sul calendario"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Informazioni sull'attivit�"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Informazioni di Diario"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Informazioni sulla disponibilit�"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Informazioni di calendario"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Aggiornare"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Aggiorna 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 "Informazioni sulla disponibilit� (da %s a %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "Informazioni iCalendar"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Devi essere un partecipante all'evento."
 
@@ -6190,7 +6290,7 @@ msgid "Print Calendar"
 msgstr "Stampa 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 "Anteprima di Stampa"
@@ -6214,7 +6314,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "La URI della cartella delle attivit� da visualizzare"
 
-#: 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"
@@ -6227,12 +6327,12 @@ msgstr ""
 "\n"
 "Cancellare comunque queste attivit�?"
 
-#: 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 "Non chiedere pi� in futuro."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Stampa card"
@@ -6303,17 +6403,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Impossibile connettersi allo store: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Promemoria"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Messaggio del Calendario"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6322,84 +6422,84 @@ msgstr ""
 "Evolution ha trovato file di posta Pine.\n"
 "Si desidera importarli in Evolution"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Calendario"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now prevede 0 argomenti"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time prevede 1 argomento"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time prevede che l'argomento 1 sia una stringa"
 
-#: 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 prevede che l'argomento 1 sia una stringa ISO 8601 data/ora"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day prevede 2 argomenti"
 
-#: 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 prevede che l'argomento 1 sia un 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 prevede che l'argomento 1 sia un intero"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin prevede 1 argomento"
 
-#: 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 prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end prevede 1 argomento"
 
-#: 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 prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype prevede 0 argomenti"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? prevede 2 argomenti"
 
-#: 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? prevede che l'argomento 1 sia un 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? prevede che l'argomento 2 sia un time_t"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contiene? prevede 2 argomenti"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contiene? prevede che l'argomento 1 sia una stringa"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contiene? prevede che l'argomento 2 sia una stringa"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6407,11 +6507,11 @@ msgstr ""
 "contiene? prevede che l'argomento 1 sia \"qualsiasi\", \"sommario\", "
 "\"descrizione\""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "ha categorie? prevede almeno 1 argomento"
 
-#: 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)"
@@ -6419,24 +6519,29 @@ msgstr ""
 "has-categories? prevede che tutti gli argomenti siano stringhe e che uno "
 "solo sia falso (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? non vuole nessun argomento"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? vuole un solo argomento"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? richiede che il primo argomento sia di tipo 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 valutazione dell'espressione di ricerca non ha restituito un valore "
 "booleano"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Altro errore"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8030,81 +8135,81 @@ msgstr "Archiviazione cartella '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "� necessario essere collegati per completare questa operazione"
 
-#: 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 "Sincronizzazione cartelle"
 
-#: 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 "Errore nel filtro di smistamento: %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 "Errore nell'esecuzione del filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Impossibile aprire la cartella per lo spool"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Impossibile operare sulla cartella per lo spool"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ricezione del messaggio %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Impossibile aprire il messaggio"
 
-#: 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 "Errore al messaggio %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 "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ricezione messaggio %d di %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Errore al messaggio %d di %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Errore di ricazione del messaggio"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argomenti non validi"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argomenti non validi"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Impossibile salvare messaggio %s nella 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 "Impossibile salvare messaggio %s nella 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 "Errore nell'esecuzione della ricerca con filtro: %s: %s"
@@ -8153,11 +8258,11 @@ msgstr ""
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Impossibile cercare attraverso l'uid in %s (operazione non supportata)"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Trasferimento dei messaggi in corso"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Copia messaggi in %s"
@@ -8481,7 +8586,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 "Cattiva risposta di autenticazione dal server."
 
@@ -8540,52 +8645,52 @@ msgstr "autorizzazione POP prima di SMTP usando una sorgente non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilazione dell'espressione regolare fallita: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necessita di un componente per lo username "
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necessita di un componente per l'host"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita di un componente per il percorso"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sto risolvendo: %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 "Errore nella ricerca del nome: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Ricerca dell'Host fallita: %s: host non trovato"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ricerca dell'Host fallita: %s: motivo sconosciuto"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Sto risolvendo: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Ricerca dell'Host fallita: %s: host non trovato"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Ricerca dell'Host fallita: %s: motivo sconosciuto"
@@ -8786,7 +8891,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"
@@ -8799,11 +8904,11 @@ msgstr ""
 "Impronta digitale:    %s\n"
 "Firma:                %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 "BENE"
 
-#: 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 "MALE"
 
@@ -8824,7 +8929,7 @@ msgstr ""
 "Accettare comunque?"
 
 #. 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"
@@ -8878,68 +8983,76 @@ msgstr "Impossibile rinominare la cartella %s: Operazione non valida"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossibile rinominare la cartella %s: Cartella inesistente"
 
-#: 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 "Operazione annullata"
 
-#: 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 "Il server si � disconnesso inaspettatamente: %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 "Risposta inaspettata dal server IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Risposta inaspettata dal server 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 "Comando IMAP fallito: %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 risposta del server � terminata troppo presto."
 
-#: 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 risposta del server IMAP non contiene informazione %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 "Risposta OK inattesa dal server 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 "Impossibile creare la directory %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 "Impossibile caricare il sommario di %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 "Cartella distrutta e ricreata sul server."
 
 #. 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 "Ricerca messaggi modificati"
 
-#: 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 "Errore di ricazione del messaggio"
 
-#: 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
@@ -8955,28 +9068,24 @@ msgstr ""
 "Impossibile prendere il messaggio: %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 "Messaggio assente"
 
-#: 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 "Questo messaggio non � al momento disponibile"
 
-#: 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 "Ricezione delle informazioni sul sommario per i nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Ricerca nuovi messaggi"
-
-#: 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 "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -8993,6 +9102,11 @@ msgstr "Impossibile aprire la directory cache: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Impossibile salvare messaggio %s nella cache: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Impossibile salvare messaggio %s nella cache: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Controllo nuova posta"
@@ -9041,77 +9155,72 @@ msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: 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 servizio per %s su  %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 "Connessione annullata"
 
-#: 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 "Impossibile connettersi a %s (porta %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 ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %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 "Operazione non supportata"
 
-#: 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 "Autenticazione fallita"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "La cartella non � vuota"
-
-#: 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 "Il server IMAP %s non supporta il tipo di autenticazione richiesto %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 "Nessun supporto per il tipo di autenticazione %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 "%sInserire la password IMAP per %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 "Non � stata inserita la password."
 
-#: 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"
@@ -9122,24 +9231,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 "Non � presente la cartella %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 "Il nome di una cartella non pu� contenere il carattere Invio."
 
-#: 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 sconosciuto: %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 "Alla cartella madre non � permesso contenere sottocartelle"
 
@@ -9215,8 +9324,8 @@ msgid ""
 msgstr "Per leggere e memorizzare la posta in file standard 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 ""
@@ -9228,7 +9337,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 "Impossibile avere la cartella %s: %s"
@@ -9242,32 +9351,32 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "File di posta locale: %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 "Impossibile rinominare la cartella %s con %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 "Impossibile rinominare la cartella: %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 "Impossibile cancellare il sommario della cartella `%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 "Impossibile cancellare il file indice della cartella `%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 "Impossibile aggiornare il sommario: %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 ""
 "Impossibile trovare messaggi da aggiungere al sommario: motivo sconosciuto"
@@ -9288,6 +9397,7 @@ msgstr "Contenuto del messaggio non valido"
 
 #: 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"
@@ -9299,12 +9409,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 cartella `%s' non esiste."
 
 #: 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"
@@ -9330,7 +9442,8 @@ msgid "not a maildir directory"
 msgstr "non � una directory 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 "Impossibile esaminare la cartella `%s':%s"
@@ -9360,7 +9473,7 @@ msgid "Storing folder"
 msgstr "Salvataggio della cartella in corso"
 
 #: 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 "Impossibile creare una cartella di lock in %s: %s"
@@ -9532,40 +9645,45 @@ msgstr "`%s' non � una directory."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Impossibile aprire il percorso della directory 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 "Le cartelle spool non possono essere rinominate"
 
-#: 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' non � una directory 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 "La cartella `%s/%s' non esiste."
 
-#: 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' non � un file regolare."
+
+#: 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 "File spool di posta %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 "Le cartelle spool non possono essere rinominate"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Le cartelle spool non possono essere rinominate"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Le cartelle spool non possono essere cancellate"
 
@@ -9658,47 +9776,47 @@ msgstr "Usa annulla"
 msgid "Operation failed: %s"
 msgstr "Operazione non riuscita: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Ricezione indice 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 "Utente cancellato"
 
-#: 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 "Impossibile avere il sommario POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Rimozione messaggi sul server in corso"
 
-#: 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 "Nessun messaggio 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 "Ricezione messaggio 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 "Impossibile prendere il messaggio: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
@@ -9976,45 +10094,45 @@ msgstr "Autenticazione temporaneamente non riuscita"
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Errore nella risposta di 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
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %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 "Il messaggio non sembra avere un formato valido"
 
-#: 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 "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Errore nella risposta di DATA"
 
-#: 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 "Il server IMAP %s non supporta il tipo di autenticazione richiesto %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 "%sInserire la password SMTP per %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,89 +10143,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 "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 "Posta SMTP consegnata attraverso il programma %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 ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non � valido."
 
-#: 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 "Invio messaggio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: 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 "Impossibile inviare il messaggio: uno o pi� destinatari non validi."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "Saluti 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 "Richiesta RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Errore nella risposta di RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "Autenticazione SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Errore nel creare un oggetto di autenticazione 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 "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Richiesta AUTH non riuscita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Cattiva risposta di autenticazione dal 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 "Richiesta MAIL FROM scaduta: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Errore nella risposta 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 "La richiesta di RCPT TO: %s: posta non inviata"
 
-#: 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> non riuscito"
 
-#: 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 "RIchiesta di DATA scaduta: %s: posta non inviata."
@@ -10115,78 +10233,69 @@ msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
 #. 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 "Errore nella risposta di 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 ""
 "DATA ha inviato il segnale di tempo scaduto: terminazione del messaggio: %s "
 "posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "Errore di risposta di 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 "Richiesta RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "Errore nella risposta di 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 "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "Errore nella risposta di QUIT"
 
-#: 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 "allegato"
 
-#: 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 "Rimuovere gli oggetti selezionati dalla lista degli allegati"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Aggiungere allegato..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Allegare un file al messaggio"
 
@@ -10218,7 +10327,7 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Consiglio visualizzazione automatica degli allegati"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Cliccare qui per la rubrica"
 
@@ -10229,46 +10338,46 @@ msgstr "Cliccare qui per la rubrica"
 #. * 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 "Rispondi-a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Da:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: 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 "Inserire i destinatari del messaggio"
 
-#: 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 ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: 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."
@@ -10279,12 +10388,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 "Nessuna descrizione disponibile"
@@ -10299,7 +10408,7 @@ msgstr "Allega un file"
 msgid "Could not create a PGP signature context"
 msgstr "Impossibile creare un contesto per la firma PGP."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10308,34 +10417,34 @@ msgstr ""
 "Errore di lettura del file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Attenzione!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Il file esiste, sovrascriverlo?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errore di accesso al file: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Impossibile scaricare messaggi dall'editor"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10344,7 +10453,7 @@ msgstr ""
 "Impossibile cercare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10353,7 +10462,7 @@ msgstr ""
 "Impossibile troncare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10362,7 +10471,7 @@ msgstr ""
 "Errore nel salvataggio automatico del messaggio: %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 ""
 "precedente.\n"
 "Si desidera tentare di recuperarli?"
 
-#: 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 ""
+"Questo messaggio non � stato inviato.\n"
+"\n"
+"Salvare le modifiche?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Attenzione: Messaggio Modificato"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Salva 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 "Componi un nuovo messaggio"
 
-#: 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 ""
 "Impossibile creare una finestra di composizione:\n"
 "impossibile attivare il controllo del selettore di indirizzi."
 
-#: 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 ""
+"Impossibile creare la finestra di composizione:\n"
+"Il componente HTML non � disponibile."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10408,13 +10539,13 @@ msgstr ""
 "Impossibile creare la finestra di composizione:\n"
 "Il componente HTML non � disponibile."
 
-#: 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 ""
 "Impossibile creare una finestra di composizione, poich� non �\n"
 "stata ancora configurata nessuna identit� nel componente della posta."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Impossibile inizializzare il composer di Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10474,8 +10606,8 @@ msgstr "L'oggetto contiene"
 msgid "Subject does not contain"
 msgstr "L'oggetto non 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?"
@@ -10623,7 +10755,8 @@ msgid "years"
 msgstr "anni"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "La data non � stata specificata."
 
 #: filter/filter-datespec.c:269
@@ -10679,16 +10812,12 @@ msgid "Add action"
 msgstr "Aggiungi Azione"
 
 #: 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 ""
-"Non � stata specificata una cartella.\n"
-"� necessario specificare una cartella valida per la memorizzazione della "
-"posta."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Specifica nome del file:"
 
-#: 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 "Scegli Cartella"
 
@@ -10701,7 +10830,7 @@ msgstr ""
 "Errore nell'espressione regolare `%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"
@@ -10890,224 +11019,228 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copia nella Cartella"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data di Ricezione"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data di spedizione"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "non contiene"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "non finisce con"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "non esiste"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "non esiste"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "non assomiglia a"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "non comincia per"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Non Esiste"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Bozza"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "finisce per"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Esistente"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "esiste"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Espressione"
 
-#: 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
-msgid "is after"
-msgstr "� dopo"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "� prima"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "� segnato"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "� maggiore di"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "� minore di"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "non �"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "non � segnato"
-
-#: 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 "Mailing list"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Corpo del messaggio"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Header del messaggio"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Sposta nella Cartella..."
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Esegui un comado della shell"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Emetti un suono:"
 
-#: 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 "Leggi"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Corrispindenza con l'espressione regolare"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Risposto a"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "� maggiore di"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "� minore di"
+#: 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 "Punteggio"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Mittente"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Imposta _Stato"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Esegui un comado della shell"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Dimensione (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "Assomiglia a"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Account Sorgente"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifica header"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "comincia per"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: 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 "Oggetto"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Imposta _Stato"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "non contiene"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "non finisce con"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "non esiste"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "non esiste"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "non assomiglia a"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "non comincia per"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "finisce per"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "esiste"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "� segnato"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "� dopo"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "� prima"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "� maggiore di"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "� minore di"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "non � segnato"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "non �"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "�"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "� maggiore di"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "� minore di"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "Assomiglia a"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "comincia per"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regole"
@@ -11141,31 +11274,31 @@ msgstr "� necessario specificare almeno una cartella come sorgente."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sta importando posta da 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 "Importazione in Corso..."
 
-#: 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 "Attendere prego"
 
-#: 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 "Importazione di %s come %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 "Scansione di \"%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 "Posta"
 
@@ -11226,39 +11359,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 sta importando i vecchi dati di 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 "Cestino"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "File di posta locale: %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 "Scansione cartella"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Inizio importazione"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Modifica Filtri"
 
-#: 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?"
@@ -11377,26 +11510,36 @@ msgid "Folder containing mail"
 msgstr "Cartella contente la posta"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Pubblico"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Cartella contente la posta"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Cestino Virtuale"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Cartella Cestino Virtuale"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Questa cartella non pu� contenere messaggi."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Propriet�..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Modifica le propriet� dei questa cartella"
 
-#: 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."
@@ -11404,80 +11547,81 @@ msgstr ""
 "Alcune delle impostazioni della posta sembrano essere state corrotte, "
 "controllare che tutto sia a posto."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Non � stato impostato un sistema di trasporto per la posta"
 
-#: 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 "Attenzione: Messaggio Modificato"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Nuovo Messaggio di Posta"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "Invia _Messaggio"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Componi un nuovo messaggio"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Nuovo Messaggio"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Messaggio Precedente"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nuovo Messaggio di Posta"
 
-#: 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 "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Impossibile attivare il componente di configurazione della posta di "
 "Evolution."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Impossibile attivare il componente folder info di 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 "Connessione al server..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Impossibile attivare lo storage nella shell"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet� per \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Propriet�"
 
-#: 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 "Impossibile creare una directory temporanea: %s"
@@ -11522,140 +11666,140 @@ msgstr "%d inviato/i"
 msgid "%d total"
 msgstr "%d totali"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crea una Cartella _Virtuale dal Messaggio"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "Cartella Virtuale sull'_Oggetto"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "Cartella Virtuale sul _Mittente"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "Cartella Virtuale sui _Destinatari"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "Cartella Virtuale sulla Mailing _List"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtro sull'_Oggetto"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _Mittente"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _Destinatari"
 
-#: 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 "Filtro sulla _Mailng List"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Modifica come Nuovo Messaggio..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "S_tampa"
 
-#: 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 "_Rispondi al Mittente"
 
-#: 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 "Rispondi alla _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 "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: 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 "Completato"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Annulla"
 
 #. 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 "Segna come _Letto"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Segna come _Non Letto"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Segna come _Importante"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Segna come _Nonimportante"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Ripristina"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: 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 "_Copia nella Cartella..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Aggiungi Mittente alla _Rubrica"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crea Rego_la dal Messaggio"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Cartella Virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Cartella Virtuale sulla Mailng List (%s)"
@@ -11728,20 +11872,20 @@ msgstr "Non sono state fornite tutte le informazioni richieste."
 msgid "Evolution Account Editor"
 msgstr "Editor degli Account di 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 "_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 "_Username:"
 
-#: 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 "_Percorso:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "� possibile creare due account con lo stesso nome."
 
@@ -11758,14 +11902,14 @@ msgid "Really delete account?"
 msgstr "Cancellare veramente questo account?"
 
 #: 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 "Disabilita"
 
 #: 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 "Abilita"
 
@@ -11854,9 +11998,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 ""
 "Il messaggio � in HTML, ma i seguenti destinatari non vogliono ricevere "
 "posta HTML:\n"
@@ -11900,7 +12045,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "� necessario specificare dei destinatari per inviare questo messaggio."
 
-#: 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?"
@@ -11908,28 +12053,28 @@ msgstr ""
 "Impossibile apreire la cartella delle bozze per questo account.\n"
 "Usare la cartella delle bozze predefinita?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Il %a, %Y-%m-%d alle %H:%M, %%s ha scritto:"
 
-#: 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 "Sposta messaggio(i) 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 "Copia messaggio(i) 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 "Sei sicuro di voler modificare tutti i %d messaggi?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11937,7 +12082,7 @@ msgstr ""
 "� possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11945,39 +12090,39 @@ msgstr ""
 "� possibile reinviare solo i messaggi\n"
 "salvati nella cartella Posta Inviata."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Sei sicuro di voler rispedire tutti i %d messaggi?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Nessun Messaggio Selezionato"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostra il prossimo messaggio non letto"
 
-#: 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 +12135,7 @@ msgstr ""
 "\n"
 "Cancellare comunque questi messaggi?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11999,64 +12144,64 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "Lettera-USA"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: 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 "Sicuro di voler aprire tutti i %d messaggi in finestre separate?"
 
-#: 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 "Nessuna descrizione disponibile"
 
-#: 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 "Contatto senza nome"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Inviata"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Aggiungi criterio"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Salva firma"
@@ -12118,16 +12263,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Guida agli Account di Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Account"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Verifica Servizi"
 
-#: 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 "Connessione al server..."
 
@@ -12841,78 +12986,74 @@ msgstr "Imposssibile creare un contesto per la busta S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Impossibile creare un contesto di codifica  S/MIME."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Salva Allegati"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Impossibile creare una directory temporanea: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Salva Allegati"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Visualizza In linea"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "View Inline (via %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Visualizzatore Esterno"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Carica _Immagini"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Caricamento del contenuto del messaggio"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Attivit� scadute:"
 
-#: 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 "Aprei il link nel Browser"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Copia la collocazione del Link"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Salva il Link come"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Salva Immagine con nome..."
 
@@ -12921,110 +13062,111 @@ msgstr "Salva Immagine con nome..."
 msgid "Pinging %s"
 msgstr "Scansione di \"%s\""
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: 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 "Indirizzo errato"
 
-#: 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 "Da"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Rispondi-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 "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 ""
 "Questo messaggio ha una firma digitale.  Fare click sull'icona per avere "
 "ulteriori informazioni."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Impossibile creare un contesto per la verifica 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 "Questo messaggio ha una firma digitale riscontrata come autentica."
 
-#: 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 ""
 "Questo messaggio ha una firma digitale di cui non � possibile provare "
 "l'autenticit�."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito 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 "Puntatore al file locale (%s) valido al sito \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformata."
 
-#: 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 "Cartelle Locali"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Riconfigurazione cartella"
 
-#: 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"
@@ -13033,27 +13175,22 @@ msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sar� pi� possibile riaprire questa cartella: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Impossibile salvarele metainfo della cartella %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Impossibile cancellare imetadati della cartella %s: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s pu� non essere stato riconfigurato perch� non � una cartella locale"
-
-#: 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."
@@ -13061,15 +13198,15 @@ msgstr ""
 "Se non si riesce pi� ad aprire questa mailbox, pu� essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Non � possibile modificare il formato di una cartella non locale."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Riconfigura /%s"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "Non � possibile modificare il formato di una cartella non locale."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13310,21 +13447,21 @@ msgstr "In Attesa..."
 msgid "User canceled operation."
 msgstr "Operazione annullata dall'utente."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Ricorda questa password"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Ricorda questa password per il resto della sessione"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Inserire la Password per %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Inserire la Password"
 
@@ -13333,11 +13470,11 @@ msgstr "Inserire la Password"
 msgid "Could not save signature file: %s"
 msgstr "Impossibile memorizzare la firma."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Salva 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"
@@ -13347,11 +13484,12 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: 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 _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 "Nome:"
 
@@ -13391,7 +13529,7 @@ msgstr ""
 "    '%s'\n"
 "che ora � stata rimossa, e quindi sono state aggiornate."
 
-#: 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 "VFolder"
 
@@ -13421,67 +13559,67 @@ msgstr "(nessun oggetto)"
 msgid "%s - Message"
 msgstr "%s - Messaggio"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Non visto"
 
-#: 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 "Risposto"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi Multipli Non Visti"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Messaggi Multipli"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Il pi� basso"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Pi� basso"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Pi� alto"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Il pi� alto"
 
-#: 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 "Oggi %I:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %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 "%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 "Generazione lista messaggi"
 
@@ -13554,45 +13692,71 @@ msgstr "Rispondi a Tutti"
 msgid "Review"
 msgstr "Anteprima"
 
-#: 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 "Completato"
+
+#: 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 "Annulla"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Scadenza "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Nome del file:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Scansione delle cartelle sotto %s in \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Scansione delle cartelle al livello della radice in \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Sottoscrivere cartella \"%s\" "
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%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 "Cartella"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Salva nella cartella..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Nessun server � stato selezionato"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Selezionare un server."
 
@@ -23496,12 +23660,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Nessuna descrizione disponibile"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Sommario della Posta"
 
-#: 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 "Cartelle Locali"
 
@@ -23511,23 +23675,23 @@ msgstr "Cartelle Locali"
 #. (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 "LIRU:LIML"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Parola del Giorno"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Citazione del Giorno"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Aggiungere un notiziario"
 
-#: 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 "Aggiungere la URL del notiziario RDF che si vuole aggiungere"
 
@@ -23567,11 +23731,11 @@ msgstr "(Nessuna Descrizione Disponibile)"
 msgid "My Weather"
 msgstr "Meteo"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr "Si � verificato un errore nella ricezione dei dati da"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Meteo"
 
@@ -24900,6 +25064,11 @@ msgstr ""
 "Impossibile trasferire la cartella:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Apri in %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25142,12 +25311,25 @@ msgid "Rename folder"
 msgstr "Rinomina cartella"
 
 #: 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 "Il nome della cartella specificato non � 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 ""
+"Impossibile rinomincare la cartella:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25156,12 +25338,12 @@ msgstr ""
 "Impossibile creare la cartella specificata:\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 _Nuova cartella..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nuovo..."
 
@@ -25191,20 +25373,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Selezionare il tipo di informazioni che si desidera importare:"
 
-#. 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 ""
-"Importazione di %s\n"
-"Importatore non pronto.\n"
-"Attendere 5 secondi per riprovare."
-
-#: 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"
@@ -25213,22 +25382,22 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Scegli Cartella"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Il file %s non esiste"
 
-#: 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 "Errore in 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"
@@ -25237,11 +25406,11 @@ msgstr ""
 "Non c'� un importatore adatto a gestire\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importazione"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25250,17 +25419,17 @@ msgstr ""
 "Importazione di %s.\n"
 "Avvio di %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Errore nell'avvio di %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Errore nel caricare: %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25269,31 +25438,31 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automatico"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Nome del file:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Scegliere un file"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Tipo di file:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Importa dati e impostazioni da altri programmi"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importa un file singolo"
 
-#: 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"
@@ -25301,24 +25470,24 @@ msgstr ""
 "Attendere...\n"
 "Ricerca di impostazioni esistenti"
 
-#: 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 "Avvio degli Importatori Intelligenti"
 
-#: 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 "Da %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Scegli cartella"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Selezionare una cartella destinazione per importare questi dati"
 
-#: 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 "Importa"
 
@@ -25346,32 +25515,32 @@ msgstr "Sincronizzazione cartella"
 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 "Lettura cartella %s in corso"
 
-#: 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 "Lettura cartella %s in corso"
 
-#: 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 "Apri 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 "Impossibile rinominare la cartella: %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 ""
@@ -25413,44 +25582,44 @@ msgstr "Il nome della cartella non pu� contenere barre (/)."
 msgid "'.' and '..' are reserved folder names."
 msgstr "I nomi di cartelle '.' e '..' sono riservati."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $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 non pu� essere eseguito."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Informazioni su Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Vai alla Cartella..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Selezionare la cartella che si desidera aprire"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Crea un nuovo collegamento"
 
-#: 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 "Selezionare la cartella a cui si vuole che punti il collegamento:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "_Lavora Connesso"
 
-#: 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 "_Lavora Disconnesso"
 
-#: 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 "Non connesso"
 
@@ -25458,27 +25627,27 @@ msgstr "Non connesso"
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#: 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 "(Nessuno)"
 
-#: 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 � al momento connesso.  Cliccare questo bottone per "
 "disconnettersi."
 
-#: 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 si sta disconnettendo."
 
-#: 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 ""
@@ -25497,12 +25666,12 @@ msgstr ""
 "L'errore del sistema di attivazione �:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25513,19 +25682,19 @@ msgstr ""
 "� inaspettatamente terminato. Sar� necessario uscire e riavviare\n"
 "Evolution prima di poter accedere nuovamente a questi dati."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Impossibile registrare OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Database di Configurazione non trovato"
 
-#: 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 generico"
 
@@ -25666,58 +25835,62 @@ msgstr "Collegamenti"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Nessun errore"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Esiste gi� una cartella con questo nome"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Il tipo di cartella specificato non � valido"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "Errore I/O"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Spazio insufficiente per creare la cartella"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "La cartella non � vuota"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "la cartella specificata non � stata trovata"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funzione non implementata"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Il tipo specificatp non � supportato"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "La cartella specificata non pu� essere modificata o rimossa"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Impossibile rendere una cartella figlia di uno dei suoi discendenti"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Impossibile creare una cartella con quel nome"
 
+#: 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 (...)"
@@ -25932,9 +26105,10 @@ msgstr ""
 "Premere il pulsante \"Succ\" per proseguire."
 
 #: 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 ""
@@ -25953,26 +26127,22 @@ msgid "Evolution Import Assistant"
 msgstr "Assistente Importazione di Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Assistente Importatore di Evolution"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Importare un File (Passo 3 di 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Tipo di Imporazione (passo 1 di 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Selezionare Tipo di Importazione (passo 2 di 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Selezionare un File (Passo 2 di 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"
@@ -26188,10 +26358,10 @@ msgstr "Mostra il contatto corrente"
 #: 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 "_Azioni"
 
@@ -26310,7 +26480,7 @@ msgid "Print this item"
 msgstr "Stampa questo oggetto"
 
 #: 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 "Salva"
 
@@ -26337,7 +26507,7 @@ msgstr "Salva l'ogetto sol 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 "_File"
 
@@ -26419,7 +26589,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Pianifica una Riunione su questo argomento"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Personalizza Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26470,29 +26641,30 @@ msgid "Post a message to a Public folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Sottoscrizione Cartelle..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Mostra messaggio in una finestra di anteprima"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Sottoscrivi e annulla sottoscrizione a cartelle su server remoti"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor delle Cartelle Virtuali..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_Anteprima"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_Sottoscrizione Cartelle..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Moifica le propriet� di questa cartella"
@@ -26590,7 +26762,7 @@ msgstr "Lista per Discussioni"
 msgid "_Expunge"
 msgstr "_Elimina per Sempre"
 
-#: 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 "_Cartelle"
 
@@ -26899,7 +27071,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Effettua una ricerca nel messaggio visualizzato"
 
 #: 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 "Imposta i parametri della pagina per la stampante corrente"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -27010,7 +27183,7 @@ msgstr "_Citato"
 msgid "_Resend..."
 msgstr "_Rinomina..."
 
-#: 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 "S_trumenti"
 
@@ -27025,12 +27198,12 @@ msgstr "Chiudi questa finestra"
 #: 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 "_Chiudi"
 
 #: 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 "_Visualizza"
 
@@ -27205,7 +27378,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Salva l'oggetto e chiudi la finestra di dialogo"
 
-#: 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 "_Aiuto"
 
@@ -27372,7 +27545,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Crea _Nuova cartella..."
 
 #: 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
@@ -27389,114 +27562,134 @@ msgid "Pi_lot Settings..."
 msgstr "Impostazioni _Pilot..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Impostazioni _Pilot..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Crea _Nuova cartella..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Invia / Ricevi"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Invia la posta in coda e ricevi quella nuova"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Configurazione della Posta"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configurazione della Posta"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Mostra informazioni su Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Invia un Bug Report"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Invia un _Bug Report"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Inoltra un Bug Report usando Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Mostra/nasconde"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostra/nascondi la barra delle cartelle"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostra/nascondi la barra dei collegamenti"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Modifica il modo di funzionamento (connesso o disconnesso)."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Mostra la cartella selezionata"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ di Ximian Evolution"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "_Informazioni su Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "Barra delle _Cartelle"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Cartelle"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Visualizza Cartella..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Importa..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Sposta..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nuovo"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Nuova Cartella"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "_Nessuna Ricorrenza"
+msgid "_Remove Other User's Folder"
+msgstr "Crea _Nuova cartella..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Rinomina..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Invia / Ricevi"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Impostazioni _Posta..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Barra dei Collegamenti"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Collegamento"
@@ -27736,11 +27929,11 @@ msgstr "Codifica dei Caratteri"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Cerca Editor"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Salva Ricerca"
 
@@ -27820,6 +28013,55 @@ msgstr "init_corba(): impossibile inizializzare GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "_Rimuovere"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Aggiungi"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Ricerca nuovi messaggi"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "La cartella non � vuota"
+
+#~ 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 ""
+#~ "Non � stata specificata una cartella.\n"
+#~ "� necessario specificare una cartella valida per la memorizzazione della "
+#~ "posta."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr ""
+#~ "%s pu� non essere stato riconfigurato perch� non � una cartella locale"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importazione di %s\n"
+#~ "Importatore non pronto.\n"
+#~ "Attendere 5 secondi per riprovare."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Assistente Importatore di Evolution"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "_Nessuna Ricorrenza"
+
 #~ msgid "Error in search expression."
 #~ msgstr "Errore nel criterio di ricerca."
 
@@ -27864,15 +28106,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "Non Partecipanti"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Questo messaggio non � stato inviato.\n"
-#~ "\n"
-#~ "Salvare le modifiche?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (predefinito)"
@@ -28218,14 +28451,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgstr "Cancella tutto tranne la firma"
 
 #, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "Firma _HTML:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Nome del file:"
-
-#, fuzzy
 #~ msgid "_HTML Signature:"
 #~ msgstr "Firma _HTML:"
 
@@ -28256,14 +28481,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Riga"
 #~ msgstr "Riga"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Aggiungi"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "Rimuovere"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Si vuole davvero rimuovere la cartella \"%s\"?"
 
@@ -28356,12 +28573,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgstr ""
 #~ "Impossibile trovare una delle tue identit� nella lista dei partecipanti!\n"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Informazioni sulla disponibilit� (da %s a %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "Informazioni iCalendar"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Tipo non valido in body-contains, ci si aspettava una stringa"
 
@@ -28638,9 +28849,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_Attivit�..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "Impostazioni _Posta..."
-
 #~ msgid "_Apply Filters"
 #~ msgstr "_Applica Filtri"
 
diff --git a/po/ja.po b/po/ja.po
index cd173cdf37..c9abbded2f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-02-12 20:57+0900\n"
 "Last-Translator: Takuo KITAME <kitame@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -322,11 +322,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 "ʣ���� VCard"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "%s �� VCard"
@@ -337,47 +343,47 @@ msgstr "%s �� 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 "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 "�����ɤκ����˥��顼��ȯ�����ޤ���"
@@ -396,13 +402,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 �򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
@@ -470,10 +476,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 "Ϣ����"
@@ -490,29 +496,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 "Ϣ����(_C)"
 
-#: 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 "Ϣ����ꥹ��(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "����Ϣ��������"
@@ -561,7 +577,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
 #: 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 �ν����������ޤ���Ǥ���"
 
@@ -569,11 +585,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."
@@ -581,7 +597,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"
@@ -592,7 +608,7 @@ msgstr ""
 "�����Ϥ�����, ���뤤�� 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"
@@ -604,7 +620,7 @@ msgstr ""
 "���� OpenLDAP ����������� CVS ����������ץ�������\n"
 "����ѥ��뤷�ʤ���Фʤ�ޤ���\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,38 +631,51 @@ msgstr ""
 "�����Ϥ�����, ���뤤�� 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 (user %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"
@@ -654,7 +683,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"
@@ -662,25 +691,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"
 
@@ -747,53 +776,53 @@ msgid "  S_how Supported Bases "
 msgstr "���ѤǤ��륿���פ�����å�(_C)"
 
 #: 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 "��� (_R)"
-
-#: 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 "��� (_R)"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "���ץ����"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -930,49 +959,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 "�����ϰ�(_C): "
 
 #. 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 "������..."
 
-#: 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"
@@ -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,46 +1027,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"
@@ -1039,7 +1074,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"
@@ -1048,7 +1083,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"
@@ -1056,7 +1091,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"
@@ -1066,7 +1101,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"
@@ -1076,27 +1111,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 "
@@ -1104,7 +1139,7 @@ msgid ""
 "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"
@@ -1112,11 +1147,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"
@@ -1125,25 +1160,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
@@ -1151,49 +1186,49 @@ msgstr ""
 msgid "_Add"
 msgstr "�ɲ�(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "�ɲ�(_A)"
 
-#: 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 "���٤ƺ��(_D)"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "ɽ��(_D)"
 
-#: 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
@@ -1203,102 +1238,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "�Խ�(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "���ݥ���Ȥ��Խ�(_E)"
 
-#: 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 "���ץ����(_O)"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "�ݡ����ֹ�(_P):"
 
-#: 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 "�����١���(_B):"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "������̾(_S):"
 
-#: 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 "������..."
@@ -1313,8 +1348,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"
@@ -1345,11 +1380,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 "�����Ԥ����Τ�Τ�ޤ�"
@@ -1428,7 +1463,7 @@ msgid "D_epartment:"
 msgstr "����(_D):"
 
 #: 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 "�ܺ�"
 
@@ -1491,13 +1526,13 @@ msgstr "HTML �᡼����������(_H)"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c: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 "���(_D)"
 
@@ -1525,1027 +1560,1027 @@ msgstr "���������� URI:"
 msgid "_Web page address:"
 msgstr "�����֥ڡ�����URL(_W):"
 
-#: 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
 #, fuzzy
 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
 #, 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 "����Х֥�"
 
@@ -2584,20 +2619,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 "�᡼��"
 
@@ -2620,6 +2655,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(_2):"
@@ -2751,7 +2799,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
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "VCard ����¸"
@@ -2802,7 +2850,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 "��鸡��"
 
@@ -2811,25 +2859,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"
@@ -2841,10 +2889,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 "�����ʥ��顼"
 
@@ -2852,7 +2900,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 "���Ĥ�����ޤ���"
@@ -2873,8 +2921,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 "����󥻥뤷�ޤ���"
 
@@ -2925,7 +2973,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 "�����ɤκ����˥��顼��ȯ�����ޤ���"
 
@@ -2942,9 +2990,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
@@ -3034,7 +3081,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 ����¸"
@@ -3120,7 +3167,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
@@ -3128,8 +3175,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 "���ߤ�ɽ��(_C)"
@@ -3138,7 +3185,7 @@ msgstr "���ߤ�ɽ��(_C)"
 #. 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"
 
@@ -3146,11 +3193,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"
@@ -3286,7 +3333,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 "��Ĺ"
 
@@ -3311,7 +3358,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 "����"
 
@@ -3334,7 +3381,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 "��Ĺ"
 
@@ -3397,20 +3444,20 @@ msgstr "���ݥ���Ȥ��Խ�(_E)"
 
 #: 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 "�㤤"
 
@@ -3421,13 +3468,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 ""
 "�ѥ����åȤΥ��������ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
@@ -3545,11 +3596,11 @@ msgstr "���顼����߻��� (ʬ)"
 msgid "_Edit appointment"
 msgstr "���ݥ���Ȥ��Խ�(_E)"
 
-#: 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"
@@ -3561,13 +3612,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
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3584,16 +3635,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 "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
 
@@ -3642,7 +3693,7 @@ msgstr "%Yǯ%m��%d��"
 msgid "%d %B"
 msgstr "%m��%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 ""
@@ -3720,9 +3771,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
@@ -3739,13 +3790,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 "������"
 
@@ -3765,82 +3816,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 "���������� URI:"
+
+#: 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 "�ե������ ToDo ���ܤ�ޤ�"
 
-#: 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 "�ե������ ToDo ���ܤ�ޤ�"
+
+#: 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 "������(_T)"
 
-#: 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 "�������ݥ����(_A)"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "�������ݥ���Ȥ�������ޤ�"
@@ -3883,29 +3954,30 @@ msgid "Alarm Repeat"
 msgstr "���顼��η����֤�"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
+#, fuzzy
+msgid ""
+"Evolution does not yet support email notification for reminders.  You will "
+"not be able to edit the options for this reminder."
+msgstr ""
+"����� e�᡼�� ��ޥ�����Ǥ�����Evolution �Ϥޤ����μ�����󶡤��Ƥ��ޤ���"
+"���Υ�ޥ�������Ф��ƤΥ��ץ������Խ����뤳�Ȥ��Ǥ��ޤ���"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "ɽ�������å�����"
 
-#: calendar/gui/dialogs/alarm-options.glade.h: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 ""
-"����� e�᡼�� ��ޥ�����Ǥ�����Evolution �Ϥޤ����μ�����󶡤��Ƥ��ޤ���"
-"���Υ�ޥ�������Ф��ƤΥ��ץ������Խ����뤳�Ȥ��Ǥ��ޤ���"
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "�����ΰ�����Ȥ�:"
@@ -3929,110 +4001,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 "���λ��˥᡼�����������:"
 
-#: 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 ��̤�Τ�ȯư������"
@@ -4053,7 +4125,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 "���ޥ�:"
 
@@ -4136,7 +4208,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 "������"
 
@@ -4149,7 +4221,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 "������"
 
@@ -4159,7 +4231,7 @@ msgid "S_un"
 msgstr "��(_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 "������"
 
@@ -4172,7 +4244,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "���եʥӥ������ǽ��ֹ��ɽ��(_N)"
 
 #: 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 "������"
 
@@ -4191,7 +4263,7 @@ msgid "Task List"
 msgstr "�������ꥹ��(_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 "������"
 
@@ -4208,7 +4280,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 "������"
 
@@ -4217,7 +4289,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 "������"
 
@@ -4441,8 +4513,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 "��̾����¸..."
 
@@ -4511,27 +4583,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 "���"
 
@@ -4603,20 +4675,20 @@ msgstr "�����(_E):"
 msgid "_Start time:"
 msgstr "���ϻ���(_S):"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 #, fuzzy
 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 "��Ǥ��(_D)..."
 
@@ -4656,7 +4728,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"
@@ -4668,7 +4740,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 "���ơ�����"
@@ -4744,48 +4816,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 "����¾�� 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 "��"
 
-#: 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 "�����"
 
@@ -4878,7 +4950,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 "ư�ɬ��"
 
@@ -4887,7 +4959,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:"
 
@@ -4899,17 +4971,17 @@ msgstr "ͥ����(_P):"
 msgid "_Status:"
 msgstr "���ơ�����(_S):"
 
-#: 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:"
@@ -4979,13 +5051,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 "���򤷤�Ϣ����������ޤ�"
 
-#: 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 "����(_O)"
@@ -4995,30 +5067,30 @@ msgstr "����(_O)"
 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 "����(_P)..."
 
-#: 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 "�ڼ��(_U)"
 
-#: 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 "���ԡ�(_C)"
 
-#: 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"
@@ -5047,12 +5119,12 @@ msgstr "��������λ�Ȥ��ƥޡ���(_M)"
 msgid "_Delete Selected Tasks"
 msgstr "���򤷤�����������(_D)"
 
-#: 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 "���������ɲä���ˤϤ����򥯥�å�"
@@ -5061,8 +5133,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 "��λ���ޤ���"
 
@@ -5091,7 +5163,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 "���ޥ�"
@@ -5158,463 +5230,469 @@ msgstr "����"
 msgid "pm"
 msgstr "���"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "�������ݥ����(_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 "�����������٥��"
 
-#: 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 "�����ذ�ư(_T)"
 
-#: 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)..."
 
-#: 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 "����/¿˻ ����θ���(_P)"
 
-#: 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 "��̾����¸(_S)..."
 
-#: 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 "�ߡ��ƥ��󥰤Υ������塼��(_M)"
 
-#: 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 "iCalender�Ȥ���ž��(_C)"
 
-#: 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)"
 
-#: 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 "����������(_O)"
 
-#: 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 "���٤Ƥν��������(_A)"
 
-#: 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 "%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
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>����:</b> %s"
 
-#: 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 "����������(_C):"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 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
 #, fuzzy
 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 "<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 "���ơ�����(_S):"
 
-#: 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
 #, fuzzy
 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 "OK"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 #, fuzzy
 msgid "Accept"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 #, fuzzy
 msgid "Decline"
 msgstr "���ष��"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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 "<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
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
-#: 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
 #, fuzzy
 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 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"
-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
 #, fuzzy
 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 ""
 
-#: 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 "�ե����������"
@@ -5660,7 +5738,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 "ɬ�׻��ü�"
 
@@ -5674,52 +5752,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 "��Ǥ����"
 
@@ -5809,43 +5887,50 @@ msgstr "��ij��ϻ���(_S):"
 msgid "Meeting _end time:"
 msgstr "��Ľ�λ����(_E):"
 
-#: 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 �򥪡��ץ���"
 
-#: 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 "�������ݥ����(_A)..."
 
@@ -5859,7 +5944,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 "���顼��"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5867,7 +5958,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"
@@ -5875,12 +5966,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 "�ե���� %s �򥪡��ץ���"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "�ե���� %s �򥪡��ץ���"
@@ -5941,54 +6032,64 @@ msgstr "10 ��"
 msgid "September"
 msgstr "9 ��"
 
-#: 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
 #, fuzzy
 msgid "Event information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "���ץ����"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 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
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "����/¿˻ ����"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "����������"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6228,7 +6329,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 "�����ץ�ӥ塼"
@@ -6252,7 +6353,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 "
@@ -6265,12 +6366,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 "�����ɤΰ���"
@@ -6344,17 +6445,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"
@@ -6363,115 +6464,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 ""
 
-#: 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 "����¾�Υ��顼"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8139,82 +8245,82 @@ msgstr "�ե���� '%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 "�ե������Ʊ����"
 
-#: 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"
@@ -8261,11 +8367,11 @@ msgstr "̤�б������: ����ɽ���Ǥθ���: %s ��"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "̤�б������: uid �Ǥθ���: %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 �إ�å������򥳥ԡ���"
@@ -8587,7 +8693,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 "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
@@ -8644,52 +8750,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: ̤�Τ���ͳ�Ǥ�"
@@ -8888,7 +8994,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"
@@ -8897,11 +9003,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 ""
 
@@ -8923,7 +9029,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"
@@ -8978,68 +9084,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 "IMAP �����Ф���ͽ�����ʤ� 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 "�ǥ��쥯�ȥ� %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
@@ -9055,28 +9169,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 �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
 
@@ -9093,6 +9203,11 @@ msgstr "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %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 "����᡼��Υ����å�"
@@ -9140,77 +9255,72 @@ 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 "�ե���� `%s' ��¸�ߤ��ޤ���"
-
-#: 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 %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: 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"
@@ -9221,24 +9331,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
 #, 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 ""
 
@@ -9316,8 +9426,8 @@ msgid ""
 msgstr "ɸ�� 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 "��¸���줿�롼�� %s �����Хѥ��ǤϤ���ޤ���"
@@ -9329,7 +9439,7 @@ msgstr "��¸���줿�롼�� %s ���̾�Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�ե�������������ޤ���: %s: %s"
@@ -9343,33 +9453,33 @@ msgstr "��������ؤ���¸�� inbox ����Ƥޤ���"
 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 "���ޥ�إ�å��������ɲä��뤳�Ȥ�����ޤ���: ̤�Τ���ͳ�Ǥ�"
 
@@ -9390,6 +9500,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"
@@ -9401,12 +9512,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"
@@ -9432,7 +9545,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"
@@ -9462,7 +9576,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"
@@ -9633,40 +9747,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 "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
 
-#: 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 ���̾�Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: 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 "���ס���᡼��ե����� %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 "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
 
-#: 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 "���ס���ե�����Ϻ���Ǥ��ޤ���"
 
@@ -9757,50 +9876,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 "�����ʹ߿�"
@@ -10072,45 +10191,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 %s@%s �� SMTP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: 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"
@@ -10121,90 +10240,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 "%s ��ͳ�� SMTP �᡼����ۿ����ޤ�"
 
-#: 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 ""
 
-#: 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 "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 "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: �᡼����������ޤ���Ǥ���"
@@ -10212,81 +10331,72 @@ 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 "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 "��å������إե������ź�դ��ޤ�"
 
@@ -10318,7 +10428,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 "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
 
@@ -10329,45 +10439,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."
@@ -10378,12 +10488,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "�ݡ����ֹ�(_P):"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "����"
@@ -10398,7 +10508,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"
@@ -10407,34 +10517,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"
@@ -10443,7 +10553,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"
@@ -10452,7 +10562,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"
@@ -10461,7 +10571,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?"
@@ -10469,34 +10579,56 @@ msgstr ""
 "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
+#, 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"
+"��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
+
+#: composer/e-msg-composer.c:2879
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10505,13 +10637,13 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: 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."
@@ -10519,8 +10651,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
@@ -10571,8 +10704,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?"
@@ -10721,7 +10854,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
@@ -10777,15 +10911,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 "�ե����������"
 
@@ -10798,7 +10929,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 "����"
@@ -10987,227 +11118,231 @@ 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
 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 ""
 
-#: 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 "�����Τ�Τdz��Ϥ���"
-
-#: 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 "�����Τ�Τdz��Ϥ���"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "�롼��"
@@ -11242,31 +11377,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 "�᡼��"
 
@@ -11327,39 +11462,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 "��������᡼��ե����� %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?"
@@ -11477,103 +11612,114 @@ 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."
 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 "��å�������᡼��(_M)"
 
-#: 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"
@@ -11618,140 +11764,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 "��å��������鲾�ۥե���������(_V)"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "��̾�β��ۥե����(_S)"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "�����Ԥβ��ۥե����(_N)"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "�����Ԥβ��ۥե����(_R)"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "��̾�Υե��륿(_J)"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "�����ԤΥե��륿(_D)"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "�����ԤΥե��륿(_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)"
 
-#: 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 "����(_P)"
 
-#: 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)"
 
-#: 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 "�ꥹ�Ȥ��ֿ�(_L)"
 
-#: 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 "�������ֿ�(_A)"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "ž��(_F)"
 
-#: 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 "�����ѤߤȤ��ƥޡ���(_K)"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "̤�ɤȤ��ƥޡ���(_N)"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "���פȤ��ƥޡ���(_I)"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "����פȤ��ƥޡ���(_P)"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "������(_U)"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: 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 "�ե�����إ��ԡ�(_C)..."
 
-#: 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 "��å���������롼������(_L)"
 
-#: 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)"
@@ -11825,20 +11971,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 "�ۥ���(_H):"
 
-#: 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 "�桼��̾(_U):"
 
-#: 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 "�ѥ�(_P):"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Ʊ��̾���Υ�������Ȥ�2�ĺ����Ǥ��ޤ���"
 
@@ -11855,14 +12001,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 "ͭ��"
 
@@ -11947,8 +12093,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
@@ -11984,7 +12130,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?"
@@ -11992,28 +12138,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 "%Yǯ%m��%d��(%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."
@@ -12021,7 +12167,7 @@ msgstr ""
 "�ɥ�եȥե���������¸���줿\n"
 "��å������������Խ����뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12029,39 +12175,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"
@@ -12073,7 +12219,7 @@ msgstr ""
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12082,64 +12228,64 @@ 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 ""
 
-#: 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 ��å��������̥�����ɥ��dz����Ƥ��������Ǥ���?"
 
-#: 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 "��̾����¸"
@@ -12197,16 +12343,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 "�����Ф���³��..."
 
@@ -12933,78 +13079,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 "�ƥ�ݥ�� mbox '%s' ������Ǥ��ޤ���Ǥ���: %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 "�������ɤ߹���(_I)"
 
-#: 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 "���¤�᤮�������ƥ�(_O)"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%m�� %d�� %p %l:%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 "�֥饦���ǥ�󥯤򳫤�"
 
-#: 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 "��������¸..."
 
@@ -13013,108 +13155,109 @@ 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
 #, fuzzy
 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 ""
 
-#: 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"
@@ -13123,27 +13266,22 @@ msgstr ""
 "�ե�����Υ᥿�������¸����ޤ���; ��Ϥ䤳�Υե�����򳫤�\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 ����¸�Ǥ��ޤ���: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "�ե�����Υ᥿�ǡ��� %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 ""
-
-#: 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."
@@ -13151,15 +13289,15 @@ msgstr ""
 "�⤷���Υ᡼��ܥå����򳫤����ȤϤʤ��ʤ�\n"
 "��ư�Dz���������ɬ�פ����뤫�⤷��ޤ���"
 
-#: 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 ""
@@ -13400,20 +13538,20 @@ msgstr "�Ե���..."
 msgid "User canceled operation."
 msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "���Υѥ���ɤ򵭲�(_R)"
 
-#: 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 "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
 
@@ -13422,11 +13560,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"
@@ -13436,11 +13574,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��̾�ե�����(_H):"
 
-#: 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 "̾��:"
 
@@ -13476,7 +13615,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 "���ۥե����"
 
@@ -13507,67 +13646,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 "������ %p %l:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%m�� %d�� %p %l:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%Yǯ %m�� %d��"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "��å������ꥹ�Ȥ������"
 
@@ -13642,45 +13781,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 "����������"
 
@@ -24543,12 +24708,12 @@ msgstr "%B%d��%l��%Mʬ"
 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 "��������ե����"
 
@@ -24558,23 +24723,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 "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 ������"
 
@@ -24613,12 +24778,12 @@ msgstr "(�����ʤ�)"
 msgid "My Weather"
 msgstr "��ŷ��"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 #, fuzzy
 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 "��ŷ��"
 
@@ -25965,6 +26130,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"
@@ -26200,12 +26370,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"
@@ -26214,12 +26397,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 "�����ե���������(_N)..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "����..."
 
@@ -26249,20 +26432,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"
@@ -26271,23 +26441,23 @@ 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
 #, 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"
@@ -26296,11 +26466,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"
@@ -26309,17 +26479,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"
@@ -26328,54 +26498,54 @@ 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"
 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 "%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 "����ݡ���"
 
@@ -26401,32 +26571,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 ""
@@ -26468,46 +26638,46 @@ 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
 #, fuzzy
 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
 #, fuzzy
 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 "���ե饤����(_W)"
 
-#: 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 "���ե饤����"
 
@@ -26515,27 +26685,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 ""
@@ -26550,12 +26720,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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"
@@ -26563,19 +26733,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 "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 "����Ū�ʥ��顼"
 
@@ -26714,59 +26884,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 "I/O ���顼"
 
-#: 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 "%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 (...)"
@@ -26981,7 +27155,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 ""
@@ -26997,26 +27171,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"
@@ -27247,10 +27417,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 "ư��(_A)"
 
@@ -27369,7 +27539,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 "��¸"
 
@@ -27396,7 +27566,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 "�ե�����(_F)"
 
@@ -27478,7 +27648,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 "My Evolution �Υ������ޥ���"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -27528,29 +27699,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 "���ۥե�������ǥ���(_E)..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "�ե��륿(_F)..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "�ץ�ӥ塼�ڥ���(_P)"
 
-#: 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 "���Υե������������ѹ����ޤ�"
@@ -27644,7 +27816,7 @@ msgstr "��å������ꥹ�Ȥ򥹥�åɲ����ޤ�"
 msgid "_Expunge"
 msgstr "�������(_E)"
 
-#: 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 "�ե����(_F)"
 
@@ -27960,7 +28132,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
@@ -28075,7 +28248,7 @@ msgstr "����"
 msgid "_Resend..."
 msgstr "��͡���(_R)..."
 
-#: 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)"
 
@@ -28090,12 +28263,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 "�Ĥ���(_C)"
 
 #: 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 "ɽ��(_V)"
 
@@ -28271,7 +28444,7 @@ msgstr "HTML"
 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 "�إ��(_H)"
 
@@ -28440,7 +28613,7 @@ msgid "Open Other _User's Folder..."
 msgstr "�����ե���������(_N)..."
 
 #: 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
@@ -28457,114 +28630,134 @@ msgid "Pi_lot Settings..."
 msgstr "Pilot ������(_M)..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Pilot ������(_M)..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "�����ե���������(_N)..."
+
+#: ui/evolution.xml.h:29
 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 "�Զ���������(_B)"
 
-#: 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 "Ximian Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "Ximian Evolution �ˤĤ���(_A)..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "���ԡ�(_C)..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "�ե�����С�(_F)"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "�ե����(_F)"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "�ե�����ذ�ư(_G)..."
 
-#: 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 "��ư(_M)..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "����(_N)"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "�����ե����(_N)"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "�����֤��ʤ�(_N)"
+msgid "_Remove Other User's Folder"
+msgstr "�����ե���������(_N)..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "��͡���(_R)..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "������(_S)"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "�᡼������(_M)..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "���硼�ȥ��åȥС�(_S)"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "���硼�ȥ��å�(_S)"
@@ -28807,11 +29000,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 "��������¸"
 
@@ -28891,6 +29084,50 @@ msgstr "init_corba(): GNOME ���������뤳�Ȥ�����ޤ���Ǥ���"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "��� (_R)"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "�ɲ�(_A)"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "������������������"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "�ե���� `%s' ��¸�ߤ��ޤ���"
+
+#~ 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 ""
+#~ "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 "�����֤��ʤ�(_N)"
+
 #~ msgid "Error in search expression."
 #~ msgstr "����������ɽ���ǥ��顼"
 
@@ -28942,15 +29179,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 " (�ǥե����)"
@@ -29225,14 +29453,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Select a signature script"
 #~ msgstr "��̾�ʳ�����"
 
-#, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "HTML��̾�ե�����(_H):"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "�ե�����̾:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "HTML��̾�ե�����(_H):"
 
@@ -29264,14 +29484,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Riga"
 #~ msgstr "��:"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "�ɲ�(_A)"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "��� (_R)"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "������ �ե���� \"%s\" �������Ƥ��������Ǥ���?"
 
@@ -29803,9 +30015,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "_Task..."
 #~ msgstr "������(_T)..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "�᡼������(_M)..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "ź�դ���ž��(_A)"
 
diff --git a/po/ko.po b/po/ko.po
index 804b96a308..2dc6050dbb 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: $PACKAGE $VERSION\n"
-"POT-Creation-Date: 2002-09-24 12:28+0900\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-09-24 07:36+0900\n"
 "Last-Translator: Young-Ho, Cha <ganadist@mizi.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
@@ -321,11 +321,17 @@ 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
+#, fuzzy
+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 ""
@@ -336,46 +342,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 "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 "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 ""
 
 #: 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�� ������ �� �����ϴ�"
@@ -467,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 "����ó"
@@ -487,28 +493,38 @@ 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 "����ó(_C)"
 
-#: 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
 msgid "Contact _List"
 msgstr "����ó ���(_L)"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 msgid "Create a new contact list"
 msgstr "�� ����ó ����� ����ϴ�"
 
@@ -549,7 +565,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(�� evolution ����� SSL�� �������� �ʽ��ϴ�)"
 
 #: 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�� �ʱ�ȭ �� �� �����ϴ�"
 
@@ -557,24 +573,24 @@ 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."
 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"
@@ -582,43 +598,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
-#, 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 "KPOP �������� �����Ҽ� ����: %s"
+
+#: 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
 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"
@@ -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 "���� Ž���Ⱑ ������ URI"
 
@@ -836,8 +862,7 @@ msgstr "Evolution�� �� ���� �ּҷ� ������ �����Ҷ� ����մϴ�"
 #: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution�� �� ���� �ּҷ� ������ ������ �� ����մϴ�"
+msgstr "Evolution�� �� ���� �ּҷ� ������ ������ �� ����մϴ�"
 
 #: addressbook/gui/component/ldap-config.glade.h:32
 #, fuzzy
@@ -897,47 +922,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 "� ����(_E): "
 
 #. 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"
@@ -948,7 +979,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"
@@ -957,46 +988,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"
@@ -1004,7 +1035,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"
@@ -1013,7 +1044,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"
@@ -1021,7 +1052,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"
@@ -1031,7 +1062,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"
@@ -1041,27 +1072,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 "
@@ -1069,7 +1100,7 @@ msgid ""
 "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"
@@ -1077,11 +1108,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"
@@ -1090,25 +1121,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
@@ -1116,46 +1147,46 @@ msgstr ""
 msgid "_Add"
 msgstr "����(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 msgid "_Add ->"
 msgstr "���ϱ�(_A) ->"
 
-#: 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
 #, 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 "��� ����(_D)"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "ǥ��(_D)"
 
-#: 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
@@ -1165,99 +1196,99 @@ msgstr ""
 msgid "_Edit"
 msgstr "��ġ��(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "��� ����(_E)"
 
-#: 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 >>"
 msgstr "����(_O)"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "��Ʈ(_P):"
 
-#: 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 "�˻� ����(_c):"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "���� �̸�(_S):"
 
-#: 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
 #, 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 "�˻���"
@@ -1272,8 +1303,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"
@@ -1304,11 +1335,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
 msgid "Find contact in"
 msgstr "�ּҷ� ã��"
 
@@ -1379,7 +1410,7 @@ msgid "D_epartment:"
 msgstr "�μ�(_E):"
 
 #: 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 "�ڼ���"
 
@@ -1436,13 +1467,13 @@ msgstr "HTML���� ���� ���(_H)"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c: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 "����(_D)"
 
@@ -1470,1027 +1501,1027 @@ msgstr ""
 msgid "_Web page address:"
 msgstr "Ȩ������ �ּ�(_W):"
 
-#: 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 "�����Ͼ� And Herzegowina"
 
-#: 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 "ij����"
 
-#: 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
 #, 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
 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 "�ij���"
 
-#: 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
 #, 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 "���ٺ��"
 
@@ -2527,20 +2558,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 "�̸���"
 
@@ -2560,6 +2591,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 "������ ������?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "�ּ� _2:"
@@ -2690,7 +2734,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�� ��� ����"
 
@@ -2738,7 +2782,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 "���� �"
 
@@ -2747,25 +2791,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 ""
 
-#: 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
 #, 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"
@@ -2777,10 +2821,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 "�� �� ���� ����"
 
@@ -2788,7 +2832,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 "�㰡�� �ź�"
@@ -2809,8 +2853,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 "��ҵ�"
 
@@ -2861,7 +2905,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 "ī�� ������� ����"
 
@@ -2878,9 +2922,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
@@ -2968,7 +3011,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�� ����"
@@ -3045,7 +3088,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
@@ -3053,8 +3096,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 "���� ����"
 
@@ -3062,7 +3105,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,"
@@ -3072,13 +3115,13 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c: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"
@@ -3202,7 +3245,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 "����"
 
@@ -3227,7 +3270,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 "����"
 
@@ -3250,7 +3293,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 "����"
 
@@ -3312,20 +3355,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 "����"
 
@@ -3336,13 +3379,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 ""
 
@@ -3450,11 +3497,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "��� ��ġ��(_E)"
 
-#: 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"
@@ -3462,13 +3509,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:2872
+#: 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 "
@@ -3479,15 +3526,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 "�׳��� �ʱ�ȭ �� �� �����ϴ�"
 
-#: 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 "�˶� ��� ���� ���丮�� ���� ���� �����ϴ�"
 
@@ -3536,7 +3583,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 ""
@@ -3610,9 +3657,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
@@ -3629,13 +3676,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 "�ƴϿ�"
 
@@ -3655,77 +3702,96 @@ 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 "�޷�"
+
+#: 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
+#, 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
 msgid "New appointment"
 msgstr "�� ���"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "���(_A)"
 
-#: 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 "ȸ��(_M)"
 
-#: 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
 msgid "New task"
 msgstr "�� �۾�"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "�۾�(_T)"
 
-#: 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 "�� ���(_A)"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "�� ����� ����ϴ�"
@@ -3768,27 +3834,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 ""
@@ -3812,110 +3878,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 "�Ϸ羿"
 
-#: 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 "���־�"
 
-#: 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 "�ѽð���"
 
-#: 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 "�Ϻи���"
 
-#: 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 "�̸��� ������"
 
-#: 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 ""
 
-#: calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/dialogs/alarm-page.c:468
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3936,7 +4002,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 "���"
 
@@ -4018,7 +4084,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 "�ݿ���"
 
@@ -4031,7 +4097,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 "������"
 
@@ -4040,7 +4106,7 @@ msgid "S_un"
 msgstr "��(_U)"
 
 #: 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 "�����"
 
@@ -4053,7 +4119,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 "�Ͽ���"
 
@@ -4070,7 +4136,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 "�����"
 
@@ -4087,7 +4153,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 "ȭ����"
 
@@ -4096,7 +4162,7 @@ msgid "W_eek starts:"
 msgstr "���� ����(_E):"
 
 #: 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 "������"
 
@@ -4316,8 +4382,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 "�ٸ� �̸����� ����..."
 
@@ -4386,27 +4452,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 "ȸ��"
 
@@ -4475,19 +4541,19 @@ msgstr "����ġ�� �ð�(_E):"
 msgid "_Start time:"
 msgstr "���� �ð�(_S):"
 
-#: 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 ""
 
@@ -4527,7 +4593,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 ""
@@ -4539,7 +4605,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 "����"
@@ -4615,47 +4681,47 @@ 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 "��(_F):"
 
-#: 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
 #, 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 ""
 
@@ -4747,7 +4813,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 ""
 
@@ -4756,7 +4822,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 ""
 
@@ -4768,17 +4834,17 @@ msgstr "�켱����(_P):"
 msgid "_Status:"
 msgstr "����(_S):"
 
-#: 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:"
@@ -4793,56 +4859,67 @@ msgid "_Due Date:"
 msgstr "���� ����(_D):"
 
 #: calendar/gui/e-calendar-table.c:440
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:441
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:442
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:443
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:444
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:445
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:446
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:447
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:448
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:449
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:450
+#, c-format
 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 "����(_O)"
@@ -4851,30 +4928,30 @@ msgstr "����(_O)"
 msgid "_Save as..."
 msgstr "�ٸ� �̸����� ����(_S)..."
 
-#: 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 "�μ�(_P)..."
 
-#: 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 "�ڸ���(_U)"
 
-#: 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 "�����ϱ�(_C)"
 
-#: 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"
@@ -4900,12 +4977,12 @@ msgstr ""
 msgid "_Delete Selected Tasks"
 msgstr "������ �۾� ����(_D)"
 
-#: 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 "�۾��� ���Ϸ��� �����ʽÿ�"
@@ -4914,8 +4991,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 "�Ϸ�"
 
@@ -4944,7 +5021,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 "���"
@@ -5008,445 +5085,451 @@ msgstr "����"
 msgid "pm"
 msgstr "����"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "�� ���(_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 ""
 
-#: 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 "���÷� �̵�(_T)"
 
-#: 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)..."
 
-#: 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 "����� ����"
 
-#: 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 "�ٸ��̸����� ����(_S)..."
 
-#: 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 "ȸ�� ����(_M)"
 
-#: 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 ""
 
-#: 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 "���� ������ ����: %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
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: 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."
 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
 msgid "Location:"
 msgstr "��ġ:"
 
-#: 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
 #, 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 "Ȯ��"
 
-#: 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
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "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"
-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 ""
 
-#: 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 "`%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 "���� ����"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "���� ����"
@@ -5492,7 +5575,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 "�ʼ� ������"
 
@@ -5506,52 +5589,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 ""
 
@@ -5641,43 +5724,50 @@ msgstr "ȸ�� ���� �ð�(_S):"
 msgid "Meeting _end time:"
 msgstr "ȸ�� ���� �ð�(_E):"
 
-#: 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 "`%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 "�� ���(_A)..."
 
@@ -5691,7 +5781,13 @@ msgstr "`%s'�� �ִ� ������ �� ���� �����ϴ�"
 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 "%s�� �˸�"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5699,7 +5795,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"
@@ -5707,12 +5803,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 ������ ����"
@@ -5773,48 +5869,58 @@ 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
 #, 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
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "����� ����"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "�޷� ����"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6050,7 +6156,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:3164
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "�μ� �̸�����"
@@ -6072,7 +6178,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
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6080,12 +6186,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2644
-#: mail/mail-callbacks.c:2886
+#: 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 "ī�� �μ��ϱ�"
@@ -6149,131 +6255,136 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %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
 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 "�޷�"
 
-#: 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 "�ٸ� ����"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -7866,82 +7977,82 @@ msgstr "%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 "���� ������"
 
-#: 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 "%2$d�� %1$d�޽��� ����������"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$d�� %1$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 "�޼����� ������ ÷���մϴ�"
 
-#: 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 "�޼����� ������ ÷���մϴ�"
 
-#: 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"
@@ -7988,11 +8099,11 @@ msgstr "�������� �ʴ� ����: ǥ�������� ã��: %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "�������� �ʴ� ����: uid�� ã��: %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�� ����"
@@ -8298,7 +8409,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 ""
 
@@ -8354,51 +8465,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 "%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 ""
 
@@ -8592,7 +8703,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"
@@ -8601,11 +8712,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 ""
 
@@ -8622,7 +8733,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"
@@ -8672,69 +8783,77 @@ msgstr "������ ������ �����ϴ�: %s: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "������ ������ �����ϴ�: %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 "IMAP server�κ��� ����ġ���� �亯: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "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 ������ ����: %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 "IMAP �����κ��� ����ġ���� 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 ""
 
-#: 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
 #, fuzzy
 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
@@ -8750,29 +8869,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
-#, fuzzy
-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 ""
 
@@ -8791,6 +8905,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 "�޼����� ������ ÷���մϴ�"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "�� ���� Ȯ����"
@@ -8837,75 +8956,70 @@ 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
 #, 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 "SMTP ���� %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 ""
 
-#: 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 "LDAP ������ ������ �� ����."
 
-#: 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 "���� `%s'�� �������� �ʽ��ϴ�."
-
-#: 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 %s@%s�� ���� IMAP ������� �Է��Ͻʽÿ�"
 
-#: 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"
@@ -8913,24 +9027,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 "%s���� ������ ����"
 
-#: 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 "�� �� ���� ����: %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 ""
 
@@ -9006,8 +9120,8 @@ msgstr ""
 "���� Elm, Pine �Ǵ� Mutt����� ������ ���� ���� ���Դϴ�."
 
 #: 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 ""
@@ -9019,7 +9133,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"
@@ -9033,36 +9147,36 @@ 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 ""
 
-#: 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�� �� ���� �����ϴ�:\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 ""
 "���� ���� %s�� �� ���� �����ϴ�:\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 ""
 
@@ -9082,6 +9196,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"
@@ -9093,12 +9208,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"
@@ -9124,8 +9241,9 @@ msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
-#, fuzzy, c-format
+#: 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 ""
 
@@ -9155,7 +9273,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
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
@@ -9326,40 +9444,45 @@ msgstr ""
 "%s ���丮��\n"
 "������ ���� �����ϴٿ���: %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
 #, 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
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "���� `%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
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "���� ���� ���� %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 "���� ���� ���� %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 ""
 
@@ -9451,51 +9574,51 @@ 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
 #, fuzzy
 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 "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 "�� ������ ����"
@@ -9602,8 +9725,7 @@ msgstr "�������"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"���� �ý����� \"sendmail\"���α׷��� ���ؼ� ������ ���� �� ����մϴ�."
+msgstr "���� �ý����� \"sendmail\"���α׷��� ���ؼ� ������ ���� �� ����մϴ�."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:108
 #, fuzzy
@@ -9756,40 +9878,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
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c: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 "%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 ""
 
-#: 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"
@@ -9797,88 +9919,88 @@ msgid ""
 "\n"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 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 ""
@@ -9886,76 +10008,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 ����Ʈ"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u ����Ʈ"
-
-#: 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 "�޼����� ������ ÷���մϴ�"
 
@@ -9987,7 +10100,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 "�ּҷ�"
 
@@ -9998,45 +10111,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."
@@ -10045,12 +10158,12 @@ msgstr "���� ��Ͽ��� ������ �޼����� �纻�� ���� ������� �ּҸ� �Է��ϼ���"
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "��Ʈ(_P):"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "���� ����"
@@ -10065,41 +10178,41 @@ msgstr "������ ÷���մϴ�"
 msgid "Could not create a PGP signature context"
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "������ �д��� ���� �߻�: %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
 #, fuzzy, 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
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10108,7 +10221,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10117,7 +10230,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10126,39 +10239,61 @@ 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?"
 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 ""
+"������ �ٲ������, ������� �ʾҽ��ϴ�.\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
 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
+#, 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"
+"�޽��� �ۼ�â�� ���� ���� �����ϴ�."
+
+#: composer/e-msg-composer.c:2879
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10167,13 +10302,13 @@ msgstr ""
 "���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
 "�޽��� �ۼ�â�� ���� ���� �����ϴ�."
 
-#: 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."
@@ -10181,8 +10316,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
@@ -10233,8 +10369,8 @@ msgstr "���� ����"
 msgid "Subject does not contain"
 msgstr "���� ���Ե��� ����"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2511
-#: 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?"
@@ -10381,7 +10517,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
@@ -10436,13 +10573,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 "�� �Ÿ����� �̸��� �־�� �մϴ�."
 
-#: 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 "���� ����"
 
@@ -10455,7 +10591,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 "�߿�"
@@ -10630,224 +10766,228 @@ 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:12
+msgid "Do Not Exist"
+msgstr "�������� ����"
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "�������� ����"
+msgid "Draft"
+msgstr "�ӽ� ������"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "������ ����"
+msgid "Exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "�������� ����"
+msgid "Expression"
+msgstr "ǥ��"
 
 #: filter/libfilter-i18n.h:16
-#, fuzzy
-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"
-msgstr "�������� ����"
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#, fuzzy
+msgid "Label"
+msgstr "�η�"
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "�������� ����"
+msgid "Mailing list"
+msgstr "���ϸ� ����Ʈ"
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "�ӽ� ������"
+msgid "Message Body"
+msgstr "�޼��� ����"
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr ""
+msgid "Message Header"
+msgstr "�޼��� �Ӹ���"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
+msgid "Move to Folder"
+msgstr "������ �̵�"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "����ó�� �޼��� ����"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "ǥ��"
+#, fuzzy
+msgid "Play Sound"
+msgstr "�Ҹ� ����:"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
+#: 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
-#, fuzzy
-msgid "is after"
-msgstr "����"
+msgid "Replied to"
+msgstr "����"
 
 #: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "����"
+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 "���� ŭ"
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+msgid "Sender"
+msgstr "������"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "���� ����"
+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"
-msgstr ""
+msgid "Size (kB)"
+msgstr "ũ�� (kB)"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
-#, fuzzy
-msgid "Label"
-msgstr "�η�"
+#: 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"
-msgstr "�޼��� ����"
+msgid "Specific header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "�޼��� �Ӹ���"
+msgid "Stop Processing"
+msgstr ""
 
-#: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "������ �̵�"
+#: 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
 #, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "����ó�� �޼��� ����"
+msgid "Unset Status"
+msgstr "���� ����"
 
 #: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Play Sound"
-msgstr "�Ҹ� ����:"
+msgid "contains"
+msgstr "����"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
-msgid "Read"
-msgstr "����"
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "�������� ����"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "�޴� ���"
+msgid "does not end with"
+msgstr "������ ����"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr ""
+msgid "does not exist"
+msgstr "�������� ����"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
-msgstr "����"
+#, fuzzy
+msgid "does not return"
+msgstr "�������� ����"
 
 #: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "�ٻ�"
+msgid "does not sound like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "���� ŭ"
+msgid "does not start with"
+msgstr "�������� ����"
 
 #: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "���� ����"
+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:1807
-msgid "Sender"
-msgstr "������"
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr "���� ����"
+#, fuzzy
+msgid "is after"
+msgstr "����"
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
-msgstr ""
+#, fuzzy
+msgid "is before"
+msgstr "����"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "ũ�� (kB)"
+msgid "is greater than"
+msgstr "���� ŭ"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr ""
+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
+#, fuzzy
+msgid "returns greater than"
+msgstr "���� ŭ"
+
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr ""
+#, fuzzy
+msgid "returns less than"
+msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
-msgid "Subject"
-msgstr "����"
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "�ٻ�"
 
 #: filter/libfilter-i18n.h:61
-#, fuzzy
-msgid "Unset Status"
-msgstr "���� ����"
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr ""
 
 #: filter/rule-editor.c:180
 msgid "Rules"
@@ -10882,31 +11022,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 "����"
 
@@ -10963,41 +11103,41 @@ 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 "���� ���� ���� %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 "IMAP ������ ���캾�ϴ�"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 #, fuzzy
 msgid "Starting import"
 msgstr "���� ��¥(_S):"
 
-#: 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?"
@@ -11105,98 +11245,109 @@ 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."
 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 "���� �����(_M)"
 
-#: 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 "���� ��ġ��(_P)"
 
-#: 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 "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
 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"
@@ -11241,129 +11392,129 @@ msgstr " %d�� ����"
 msgid "%d total"
 msgstr "��� %d��"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 msgid "Create _Virtual Folder From Search..."
 msgstr "ã�� �Ϳ��� ���� ���� �����(_V)"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "���񿡵��� ��������(_S)"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "�����̿� ���� ��������(_N)"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "�����̿� ���� ��������(_R)"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "���ϸ� ����Ʈ�� ���� ��������(_L)"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "���� ���� �Ÿ���(_J)"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "�����̿� ���� �Ÿ���(_D)"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "�����̿� ���� �Ÿ���(_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)"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "�� �޼����� ��ħ(_E)..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "�μ�(_P)"
 
-#: 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)"
 
-#: 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 "��Ͽ� ����(_L)"
 
-#: 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 "��ü�� ����(_A)"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "����(_F)"
 
-#: 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 "ǥ�� �Ϸ�(_G)"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 msgid "Cl_ear Flag"
 msgstr "ǥ�� ���(_E)"
 
 #. 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 "���� ������ ǥ��(_K)"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 msgid "Mark as _Unread"
 msgstr "���� ���� ������ ǥ��(_U)"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "�߿��� ������ ǥ��(_I)"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 msgid "_Mark as Unimportant"
 msgstr "�߿����� ���� ������ ǥ��(_M)"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 msgid "U_ndelete"
 msgstr "�ǻ츲(_N)"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 msgid "Mo_ve to Folder..."
 msgstr "������ �ű�(_V)..."
 
-#: 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 "������ ����(_C)..."
 
-#: 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 "�Ÿ��� ����(_Y)"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 msgid "Crea_te Rule From Message"
 msgstr "�޽����κ��� �Ÿ��� �����(_T)"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 msgid "VFolder on M_ailing List"
 msgstr "���ϸ� ����Ʈ�� ���� ��������(_A)"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "���ϸ� ����Ʈ�� ���� �Ÿ��� (%s) (_M)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "���ϸ� ����Ʈ�� ���� �������� (%s) (_A)"
@@ -11434,19 +11585,19 @@ 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 "ȣ��Ʈ(_H):"
 
-#: 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 "������̸�(_N):"
 
-#: 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 "���(_P):"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11463,14 +11614,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 "���"
 
@@ -11549,8 +11700,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
@@ -11593,28 +11744,28 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1183
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1187
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Y-%m-%d %a %H:%M, %%s��(��) ��:"
 
-#: mail/mail-callbacks.c:1688 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:1690 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:2355
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ ��� �޼��� %d���� ��ġ�ڽ��ϱ�?"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11622,7 +11773,7 @@ msgstr ""
 "�ӽ� ������ ������ ������ �޼�����\n"
 "��ĥ �� �ֽ��ϴ�."
 
-#: mail/mail-callbacks.c:2419
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11630,39 +11781,39 @@ msgstr ""
 "���� �����Կ� �ִ� �޼�����\n"
 "�ٽ� ���� �� �ֽ��ϴ�."
 
-#: mail/mail-callbacks.c:2433
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ ��� �޼��� %d���� �ٽ� �����ڽ��ϱ�?"
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "�ƹ� �޼����� ���õ��� �ʾҽ��ϴ�"
 
-#: mail/mail-callbacks.c:2504 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "������ ������?"
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:2560
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:2629
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "������ �������� �޼����� ǥ���մϴ�"
 
-#: mail/mail-callbacks.c:2636
+#: 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:2879
+#: 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"
@@ -11670,71 +11821,71 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2992
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3004
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "�Ÿ���"
 
-#: mail/mail-callbacks.c:3048
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2$d�� %1$d��"
 
-#: mail/mail-callbacks.c:3103
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "�޼��� �μ�"
 
-#: mail/mail-callbacks.c:3130
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3171
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "�޼��� �μ��� ����"
 
-#: mail/mail-callbacks.c:3340
+#: mail/mail-callbacks.c:3386
 #, fuzzy, 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 "���� ����"
 
-#: 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
 msgid "Add Signature"
 msgstr "���� ����"
 
@@ -11744,16 +11895,16 @@ msgid ""
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
-"�Ʒ��� �������� �̸��� ���� �ּҸ� �Է��Ͻʽÿ�. �� �Ʒ��� �ִ� \"����\" "
-"�ʵ�� ������ ���� �� ������ ������ �ʰ� ������ ä���� �ʾƵ� �˴ϴ�."
+"�Ʒ��� �������� �̸��� ���� �ּҸ� �Է��Ͻʽÿ�. �� �Ʒ��� �ִ� \"����\" �ʵ�"
+"�� ������ ���� �� ������ ������ �ʰ� ������ ä���� �ʾƵ� �˴ϴ�."
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"�Ʒ��� ������ ���� ������ ���� ������ �Է��Ͻʽÿ�. Ȯ���� �𸥴ٸ�, "
-"�ý��� �����ڳ� ���ͳ� ���� �����ڿ��� ����ʽÿ�."
+"�Ʒ��� ������ ���� ������ ���� ������ �Է��Ͻʽÿ�. Ȯ���� �𸥴ٸ�, �ý�"
+"�� �����ڳ� ���ͳ� ���� �����ڿ��� ����ʽÿ�."
 
 #: mail/mail-config-druid.c:150
 msgid "Please select among the following options"
@@ -11779,16 +11930,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 "������ ������..."
 
@@ -12437,75 +12588,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 "�ӽ� ���丮�� ���� ���� �����ϴ�: %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 "%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 "�ܺ� �������α׷�"
 
-#: 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 "%b %d %p %l:%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 "���������� ��ũ ����"
 
-#: 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 "�׸��� �ٸ� �̸����� ����..."
 
@@ -12514,146 +12661,142 @@ 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 "����"
 
-#: 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 "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: 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 "���� ����"
 
-#: 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
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "������ ������ �����ϴ�: %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 ""
-
-#: 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 "%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 ""
@@ -12894,21 +13037,21 @@ msgstr "��ٸ��� ��..."
 msgid "User canceled operation."
 msgstr "����ڰ� ����� ����."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "�� ����� ���(_R)"
 
-#: 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 "����� �Է�"
 
@@ -12917,11 +13060,11 @@ msgstr "����� �Է�"
 msgid "Could not save signature file: %s"
 msgstr "�ӽ� ������ ������ ����: %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"
@@ -12931,11 +13074,11 @@ msgstr ""
 "\n"
 "�ٲ� ������ �����Ͻðڽ��ϱ�?"
 
-#: 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 "�̸�:"
 
@@ -12975,7 +13118,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 "���� ����"
 
@@ -13005,67 +13148,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 "���� %p %l:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "���� %p %l:%M "
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %p %l:%M"
 
-#: 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 "�޼��� ��� �ۼ���"
 
@@ -13140,45 +13283,70 @@ 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 "ǥ�� ���(_E)"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+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 "\"%2$s\"�� %1$s �Ʒ� �������� ã����"
 
-#: 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 "���� \"%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 "������ �����Ͻʽÿ�."
 
@@ -23929,12 +24097,12 @@ msgstr "%d�� %B %l:%M"
 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 "���� ����"
 
@@ -23944,23 +24112,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 ""
 
@@ -23997,11 +24165,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 "����"
 
@@ -25326,6 +25494,11 @@ msgid ""
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %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
 msgid "Add a Folder"
 msgstr "���� ����"
@@ -25538,12 +25711,23 @@ 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
 #, fuzzy, 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 "������ ������ �����ϴ�: %s: %s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25552,11 +25736,11 @@ msgstr ""
 "������ ������ ���� �� �����ϴ�:\n"
 "%s"
 
-#: 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 "���� �����..."
 
@@ -25581,17 +25765,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 ""
-
-#: 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"
@@ -25600,22 +25774,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"
@@ -25624,11 +25798,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"
@@ -25637,17 +25811,17 @@ msgstr ""
 "%s��(��) ��������.\n"
 "%s��(��) �����մϴ�"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, fuzzy, 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"
@@ -25656,55 +25830,55 @@ 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
 #, fuzzy
 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 "%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 "��������"
 
@@ -25732,31 +25906,31 @@ msgstr "���� ����ȭ"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 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 ""
@@ -25801,43 +25975,43 @@ 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�� ã�� �� �����ϴ�."
 
-#: 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
 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 "�¶��� �۾�(_W)"
 
-#: 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 "�������� �۾�(_W)"
 
-#: 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 "�������ο��� �۾�"
 
@@ -25845,25 +26019,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 ""
@@ -25876,12 +26050,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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"
@@ -25889,19 +26063,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 "�Ϲ� ����"
 
@@ -26041,60 +26215,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
 #, fuzzy
 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 "������ ������ �����ϴ�: %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 (...)"
@@ -26299,7 +26477,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 ""
@@ -26313,26 +26491,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 "�������� ���� (3�ܰ��� 1��°)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "�������� ���� (3�ܰ��� 2��°)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "���� ���� (3�ܰ��� 2��°)"
 
-#: 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"
@@ -26391,7 +26565,6 @@ msgstr ""
 "�������ϴ�\n"
 "Ximian Evolution ��\n"
 
-
 #: shell/main.c:259
 msgid "Don't tell me again"
 msgstr "�ٽ� ����� �ʽ��ϴ�"
@@ -26545,10 +26718,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 "�ൿ(_A)"
 
@@ -26667,7 +26840,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 "����"
 
@@ -26694,7 +26867,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 "����(_F)"
 
@@ -26776,7 +26949,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
@@ -26826,29 +27000,30 @@ msgid "Post a message to a Public folder"
 msgstr "�޼����� ������ ����"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "���� ����(_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
 msgid "Virtual Folder _Editor..."
 msgstr "���� ���� ������(_E)..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "���� �Ÿ���(_F)..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "�̸�����(_P)"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "���� ����(_S)..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "�� ������ ��������� �ٲߴϴ�"
@@ -26942,7 +27117,7 @@ msgstr "������ �޼��� ���"
 msgid "_Expunge"
 msgstr "����(_E)"
 
-#: 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 "����(_F)"
 
@@ -27247,7 +27422,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
@@ -27355,7 +27531,7 @@ msgstr "�ο�(_Q)"
 msgid "_Resend..."
 msgstr "�ٽ� ����(_R)..."
 
-#: 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)"
 
@@ -27370,12 +27546,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 "�ݱ�(_C)"
 
 #: 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 "����(_V)"
 
@@ -27547,7 +27723,7 @@ msgstr "HTML(_T)"
 msgid "Save the current file and close the window"
 msgstr "�� �׸��� �����ϰ� ��ȭ���ڸ� �ݽ��ϴ�"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "����(_H)"
 
@@ -27711,7 +27887,7 @@ msgid "Open Other _User's Folder..."
 msgstr "�ٸ� ����� ���� ����(_U)..."
 
 #: 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
@@ -27727,110 +27903,130 @@ msgid "Pi_lot Settings..."
 msgstr "���Ϸ� ����(_L)..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "���Ϸ� ����..."
+
+#: ui/evolution.xml.h:28
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr ""
+
+#: ui/evolution.xml.h:29
 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
+#, fuzzy
+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 "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 "���� ����(_B)"
 
-#: 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 "Ximian Evolution ���� ������"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "Ximian Evolution��(_A)..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "����(_C)..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "���� ����(_F)"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 msgid "_Folder..."
 msgstr "����(_F)..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "������ ����(_G)..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "��������(_I)..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "�ű��(_M).."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "���� �����(_N)"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "�� ����(_N)"
 
-#: ui/evolution.xml.h:56
-msgid "_Preferences..."
-msgstr "�⺻ ����(_P)..."
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Remove Other User's Folder"
+msgstr "�ٸ� ����� ���� ����(_U)..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "�̸��ٲ�(_R)..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "������ �ޱ�(_S)"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "����"
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "�ٷΰ��� ����(_S)"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 msgid "_Shortcut..."
 msgstr "�ٷΰ���(_S)..."
 
@@ -28059,11 +28255,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 "� ����"
 
@@ -28137,3 +28333,23 @@ msgstr "init_corba(): �׳��� �ʱ�ȭ �� �� �����ϴ�"
 #: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
+
+#, fuzzy
+#~ msgid "Scanning for new messages"
+#~ msgstr "�޽������� ����"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "���� `%s'�� �������� �ʽ��ϴ�."
+
+#~ msgid "1 byte"
+#~ msgstr "1 ����Ʈ"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u ����Ʈ"
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolution �������� �����"
+
+#~ msgid "_Preferences..."
+#~ msgstr "�⺻ ����(_P)..."
diff --git a/po/lt.po b/po/lt.po
index c0e831bebc..6f87333184 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2001-10-28 22:33+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Your language <komp_lt@konferencijos.lt>\n"
@@ -320,11 +320,17 @@ msgstr "Pavard�"
 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 "Bevardis kontakt� s�ra�as"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Keletas VCard korteli�"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VCard"
@@ -335,47 +341,47 @@ msgstr "%s 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 "Negal�jau inicializuoti 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 "Ie�koma..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "�keliama..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Jungiamasi prie LDAP serverio..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Pridedama kortel� � 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 "Pa�alinama kortel� i� LDAP serverio..."
 
-#: 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 "Taisoma kortel� LDAP serveryje..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Gaunami LDAP paie�kos rezultatai..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Klaida pa�alinant kortel�"
@@ -394,13 +400,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook ne�kelta\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 "Negal�jau paleisti wombat serverio"
 
 #: 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 "Negal�jau paleisti wombat"
@@ -471,10 +477,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 "Kontaktai"
@@ -491,29 +497,39 @@ msgstr "LDAP serveris"
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontaktai"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Aplankas, kuriame laikoma kontakt� informacija"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Sukurti nauj� kontakt�"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Naujas kontakt� s�ra�as"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "Kontakt� _s�ra�as"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Sukurti nauj� kontakt� s�ra��"
@@ -561,7 +577,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
 #: 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 "Negal�jau inicializuoti gnome-vfs"
 
@@ -569,11 +585,11 @@ msgstr "Negal�jau inicializuoti gnome-vfs"
 msgid "Other Contacts"
 msgstr "Kiti kontaktai"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adres� knygel�s"
 
-#: 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."
@@ -581,7 +597,7 @@ msgstr ""
 "Mes negal�jome atidaryti �ios adres� knygel�s. Pra�om patikrinti, ar\n"
 "kelias egzistuoja ir ar turi teises j� pasiekti."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -592,7 +608,7 @@ msgstr ""
 "kad arba tu �vedei neteising� URI, arba tavo LDAP serveris\n"
 "neveikia"
 
-#: 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"
@@ -604,7 +620,7 @@ msgstr ""
 "tu turi sukompiliuoti program� i� CVS �altinio, prie� tai\n"
 "parsisiunt�s OpenLDAP i� �emiau esan�io adreso.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -615,38 +631,50 @@ msgstr ""
 "kad arba tu �vedei neteising� URI, arba tavo LDAP serveris\n"
 "neveikia"
 
-#: 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 ""
+"Negal�jau autentikuotis � IMAP server�.\n"
+"%s\n"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "�vesk %s slapta�od� (vartotojas %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "baigiasi su"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "baigiasi su"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. 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 "Bet kuris laukas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "I�sami..."
 
-#: 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"
@@ -654,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"
@@ -662,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 "Bet kuri kategorija"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kur� rodys Aplank� nar�ykl�"
 
@@ -747,52 +775,52 @@ msgid "  S_how Supported Bases "
 msgstr " _Patikrinti, kokie tipai palaikomi"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Parinktys"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr " _Pa�alinti"
-
-#: 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 ""
 
-#: 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 " _Pa�alinti"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Parinktys"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -930,48 +958,54 @@ msgstr "One"
 
 #: 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 "Paie�kos _sritis: "
 
 #. 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 "Ie�koma"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Pa�ym�ti visus"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "I�trintas"
 
-#: 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"
@@ -982,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"
@@ -991,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 "�altinio informacija"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Jungiamasi prie serverio..."
 
-#: 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 "Nepalaikoma schema"
 
-#: 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"
@@ -1039,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"
@@ -1048,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"
@@ -1056,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"
@@ -1066,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"
@@ -1076,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 "
@@ -1106,7 +1140,7 @@ msgstr ""
 "�is vardas bus naudojamas nurodyti tavo s�skaitai. Jis skirtas tiktai "
 "vaizdavimui."
 
-#: 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"
@@ -1114,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"
@@ -1127,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 "El. pa�to adresas:"
 
-#: 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
@@ -1153,49 +1187,49 @@ msgstr ""
 msgid "_Add"
 msgstr "_Prid�ti"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
-msgstr "_Prid�ti"
+msgid "_Add ->"
+msgstr "Prid�ti"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Prid�ti veiksm�"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Prid�ti veiksm�"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Persp�jimai"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_I�trinti visk�"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "Vaiz_davimas"
 
-#: 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
@@ -1205,102 +1239,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "K_eisti"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "K_eisti �vyk�"
 
-#: 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 "_Parinktys"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Prievadas:"
 
-#: 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 "Paie�kos _pagrindas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Serverio vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "U�tildymo laikas (minut�mis)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "S�skaita"
 
-#: 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 "N�ra korteli�"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "V�l jungiamasi prie %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 "Esm�"
 
-#: 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 "Ie�koma"
@@ -1315,8 +1349,8 @@ msgstr "Adres� knygel�s vard� pasirinkimo s�sajos gamykla"
 
 #. 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"
@@ -1347,11 +1381,11 @@ msgstr "(%d nerodom�)"
 msgid "Unnamed Contact"
 msgstr "Bevardis kontaktas"
 
-#: 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 "Pasirinkti kontaktus i� adres� knygel�s"
 
-#: 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 "Rasti kontakt�"
@@ -1429,7 +1463,7 @@ msgid "D_epartment:"
 msgstr "_Departamentas:"
 
 #: 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 "Detal�s"
 
@@ -1493,13 +1527,13 @@ msgstr "Nori gauti _HTML lai�kus"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c: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 "_I�trinti"
 
@@ -1527,1025 +1561,1025 @@ msgstr "_Vie�o kalendoriaus URL:"
 msgid "_Web page address:"
 msgstr "_Tinklapio adresas:"
 
-#: 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 "Jungtin�s Valstijos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afganistanas"
 
-#: 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 "Albanija"
 
-#: 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�yras"
 
-#: 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 "Andora"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Arm�nija"
 
-#: 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 "Australija"
 
-#: 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 "Austrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbaid�anas"
 
-#: 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 "Bahamai"
 
-#: 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 "Bahreinas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Banglade�as"
 
-#: 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 "Gudija"
 
-#: 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 "Belgija"
 
-#: 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 "Belizas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Benin"
 msgstr "Beninas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "Bermudai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Butanas"
 
-#: 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 "Bolivija"
 
-#: 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 "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 ""
 
-#: 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 "Brazilija"
 
-#: 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 "Bulgarija"
 
-#: 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 "Burundis"
 
-#: 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 "Kamer�nas"
 
-#: 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 "�aliasis ky�ulys"
 
-#: 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 "Centrin� Afrikos respublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "�adas"
 
-#: 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 "�il�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Kinija"
 
-#: 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 "Kal�d� sala"
 
-#: 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 "Kolumbija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Komorai"
 
-#: 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 "Kongas"
 
-#: 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 "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 ""
 
-#: 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 "Kroatija"
 
-#: 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 "Kipras"
 
-#: 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 "�ekija"
 
-#: 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 "Danija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "D�ibutis"
 
-#: 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 "Dominikon� respublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Ryt� Timoras"
 
-#: 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 "Ekvadoras"
 
-#: 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 "Egiptas"
 
-#: 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 "Pusiaujo Gvin�ja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritr�ja"
 
-#: 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 "Estija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Folklendo salos"
 
-#: 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 "Fid�is"
 
-#: 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 "Suomija"
 
-#: 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 "Pranc�zija"
 
-#: 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 "Gabonas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambija"
 
-#: 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 "Gruzija"
 
-#: 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 "Vokietija"
 
-#: 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 "Gibraltaras"
 
-#: 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 "Graikija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grenlandija"
 
-#: 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 "Gvadelup�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guamas"
 
-#: 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 "Gvatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Gvin�ja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Bisau Gvin�ja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Gajana"
 
-#: 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 "Haitis"
 
-#: 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 "�ventoji j�ra"
 
-#: 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 "Hond�ras"
 
-#: 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 "Honkongas"
 
-#: 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 "Vengrija"
 
-#: 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 "Islandija"
 
-#: 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 "Indija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: 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 "Airija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Izraelis"
 
-#: 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 "Italija"
 
-#: 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 "Japonija"
 
-#: 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 "Jordanas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazachstanas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Kenija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "Kiribatis"
 
-#: 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 "Kor�jos respublika"
 
-#: 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 "Kuveitas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kirgistanas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laosas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Latvija"
 
-#: 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 "Liberija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Lichten�teinas"
 
-#: 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 "Lietuva"
 
-#: 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 "Liuksemburgas"
 
-#: 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 "Makedonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madagaskaras"
 
-#: 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 "Malaizija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Maldyvai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Malis"
 
-#: 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�alo salos"
 
-#: 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 "Mauritanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Mauricijus"
 
-#: 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 "Meksika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Mikronezija"
 
-#: 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 "Monakas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "Mongolija"
 
-#: 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 "Marokas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mozambikas"
 
-#: 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 "Namibija"
 
-#: 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 "Nepalas"
 
-#: 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 "Olandija"
 
-#: 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 "Naujoji Kaledonija"
 
-#: 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 "Naujoji Zelandija"
 
-#: 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 "Nikaragva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "Nigeris"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigerija"
 
-#: 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 "Norfolko sala"
 
-#: 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 "Norvegija"
 
-#: 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 "Omanas"
 
-#: 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 "Pakistanas"
 
-#: 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 "Palestinos teritorija"
 
-#: 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 Naujoji Gvin�ja"
 
-#: 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 "Paragvajus"
 
-#: 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 "Filipinai"
 
-#: 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 "Lenkija"
 
-#: 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 "Portugalija"
 
-#: 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 Rikas"
 
-#: 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 "Kvataras"
 
-#: 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 "Rumunija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Rusijos Federacija"
 
-#: 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 ""
 
-#: 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 "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 Marinas"
 
-#: 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 "Saudo Arabija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Senegalas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Sei�eliai"
 
-#: 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 Leon�"
 
-#: 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 "Singap�ras"
 
-#: 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 "Slovakija"
 
-#: 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�nija"
 
-#: 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 "Somalis"
 
-#: 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 "Piet� Afrikos respublika"
 
-#: 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 "Ispanija"
 
-#: 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 "�v .Elena"
 
-#: 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 "Sudanas"
 
-#: 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 "Surinamas"
 
-#: 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 "Svazilendas"
 
-#: 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 "�vedija"
 
-#: 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 "�veicarija"
 
-#: 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 "Taivanas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tad�ikistanas"
 
-#: 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 "Tailandas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "Togas"
 
-#: 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 "Trinidadas ir Tobagas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunisas"
 
-#: 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 "Turkija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Turkm�nistanas"
 
-#: 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 "Jungtiniai Arab� Emyratai"
 
-#: 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 "Jungtin� Karalyst�"
 
-#: 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 "Urugvajus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Uzbekistanas"
 
-#: 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 "Venesuela"
 
-#: 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 "Vietnamas"
 
-#: 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 "Vakar� Sachara"
 
-#: 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 "Jemenas"
 
-#: 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 "Jugoslavija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Zambija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbabv�"
 
@@ -2584,20 +2618,20 @@ msgstr "TTY/TDD"
 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 "Kontakto greitas prid�jimas"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Redaguoti vis�"
 
-#: 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 "Pilnas vardas"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "El. pa�tas"
 
@@ -2619,6 +2653,19 @@ msgstr ""
 "%s jau egzistuoja.\n"
 "Ar nori �ra�yti vietoj jo?"
 
+#: addressbook/gui/contact-editor/file-exists.glade.h:1
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:2
+msgid "Don't bother translating this string.  It's not used."
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#, fuzzy
+msgid "Overwrite"
+msgstr "U�ra�yti byl�?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresas _2:"
@@ -2749,7 +2796,7 @@ msgstr "contact-list-editor"
 msgid "Contact List Editor"
 msgstr "Kontakt� s�ra�o redaktorius"
 
-#: 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 "I�saugoti kaip VCard"
@@ -2800,7 +2847,7 @@ msgstr ""
 "�iame aplanke. Ar nor�tum j� vis tiek prid�ti?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "I�sami paie�ka"
 
@@ -2809,25 +2856,25 @@ msgstr "I�sami paie�ka"
 msgid "Search"
 msgstr "Paie�ka"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Klaida pradedant %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"
@@ -2839,10 +2886,10 @@ msgid "Success"
 msgstr "S�km�"
 
 #: 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 "Ne�inoma klaida"
 
@@ -2850,7 +2897,7 @@ msgstr "Ne�inoma klaida"
 msgid "Repository offline"
 msgstr "Saugykla atsijungta"
 
-#: 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 "Pri�jimas u�draustas"
@@ -2871,8 +2918,8 @@ msgstr "Protokolas nepalaikomas"
 #: 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 "Nutraukta"
 
@@ -2923,7 +2970,7 @@ msgstr "Klaida pa�alinant s�ra��"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Klaida pa�alinant kortel�"
 
@@ -2940,9 +2987,8 @@ msgstr "Vaizdavimas"
 #: 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
@@ -3032,7 +3078,7 @@ msgstr "Adres� knygel�"
 
 #: 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 "I�saugoti kaip VCard"
@@ -3118,7 +3164,7 @@ msgstr "Kopijuoti"
 msgid "Paste"
 msgstr "�d�ti"
 
-#: 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
@@ -3126,8 +3172,8 @@ msgstr "�d�ti"
 msgid "Delete"
 msgstr "I�trinti"
 
-#: 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 "_Esamas vaizdas"
@@ -3136,7 +3182,7 @@ msgstr "_Esamas vaizdas"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c: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,�"
@@ -3145,12 +3191,12 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c: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"
@@ -3287,7 +3333,7 @@ msgid "Include:"
 msgstr "�traukti:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Guls�ias lapas"
 
@@ -3312,7 +3358,7 @@ msgid "Options"
 msgstr "Parinktys"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientacija"
 
@@ -3335,7 +3381,7 @@ msgstr "Popieriaus �altinis:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Sta�ias lapas"
 
@@ -3398,20 +3444,20 @@ msgstr "K_eisti �vyk�"
 
 #: 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 "Auk�tas"
 
 #: 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 "Normalus"
 
 #: 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 "�emas"
 
@@ -3422,13 +3468,17 @@ msgstr "�emas"
 msgid "Undefined"
 msgstr "Neapibr��tas"
 
-#: 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 "�vyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: 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 "Nepavyko perskaityti piloto Calendar programos bloko"
 
@@ -3543,11 +3593,11 @@ msgstr "U�tildymo laikas (minut�mis)"
 msgid "_Edit appointment"
 msgstr "K_eisti �vyk�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "N�ra jokios apra�ymo."
 
-#: 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"
@@ -3559,13 +3609,13 @@ msgstr ""
 "si�st� lai�k�.  Evolution vietoj to parodys normal�\n"
 "u�uominos dialog�."
 
-#: 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 "�sp�jimas"
 
-#: 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 "
@@ -3576,16 +3626,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 "Kit� kart� nebeklausti."
 
-#: 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 "Negal�jau inicializuoti GNOME"
 
-#: 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 "Negal�jau sukurti laikino katalogo: %s"
@@ -3635,7 +3685,7 @@ msgstr "%Y m. %B %d 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 ""
@@ -3714,9 +3764,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 +3783,13 @@ msgid "Assigned"
 msgstr "Priskirtas"
 
 #: 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 "Taip"
 
 #: 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 "Ne"
 
@@ -3759,82 +3809,102 @@ msgstr "Savait�s rodinys"
 msgid "Month View"
 msgstr "M�nesio rodinys"
 
-#: 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 "Kalendorius"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
 
-#: 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 "_Vie�o kalendoriaus URL:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
+
+#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
+#: calendar/importers/icalendar-importer.c:704
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "U�duotys"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Aplankas, kuriame yra u�duotys"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Spausdinti korteles"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Aplankas, kuriame yra u�duotys"
+
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Naujas �vykis"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "�vykis"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Sukurti nauj� �vyk�"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Naujien� �altini� nuostatos"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Sukurti nauj� u�duot�"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Nauja u�duotis"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_U�duotis"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Sukurti nauj� u�duot�"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Naujas �vykis"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Naujas �_vykis"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Sukurti nauj� �vyk�"
@@ -3877,27 +3947,27 @@ msgid "Alarm Repeat"
 msgstr "Persp�jim� kartojimas"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid ""
+"Evolution does not yet support email notification for reminders.  You will "
+"not be able to edit the options for this reminder."
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Rodomas prane�imas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Groti gars�:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Kartoti persp�jim�"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Paleisti 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 ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Su tokiais argumentais:"
@@ -3921,110 +3991,110 @@ msgstr "valand�"
 msgid "minutes"
 msgstr "minu�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d dien�"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 diena"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d savai�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 savait�"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d valand�"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 valanda"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minu�i�"
 
-#: 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 sekund�i�"
 
-#: 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 "Groti gars�"
 
-#: 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 "Rodyti prane�im�"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Pasi�sti lai�k�"
 
-#: 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 "Paleisti program�"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Ne�inomas veiksmas, kur� reikia atlikti"
 
-#: calendar/gui/dialogs/alarm-page.c:403
+#: calendar/gui/dialogs/alarm-page.c:413
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s prie� �vykio prad�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/dialogs/alarm-page.c:416
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po �vykio prad�ios"
 
-#: calendar/gui/dialogs/alarm-page.c:411
+#: calendar/gui/dialogs/alarm-page.c:421
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s �vykio prad�ios metu"
 
-#: calendar/gui/dialogs/alarm-page.c:420
+#: calendar/gui/dialogs/alarm-page.c:430
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s prie� �vykio pabaig�"
 
-#: calendar/gui/dialogs/alarm-page.c:423
+#: calendar/gui/dialogs/alarm-page.c:433
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po �vykio pabaigos"
 
-#: calendar/gui/dialogs/alarm-page.c:428
+#: calendar/gui/dialogs/alarm-page.c:438
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s �vykio pabaigos metu"
 
-#: calendar/gui/dialogs/alarm-page.c: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 ""
@@ -4045,7 +4115,7 @@ msgstr "U�uominos"
 
 #: 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 "Ap�valga:"
 
@@ -4128,7 +4198,7 @@ msgid "Days"
 msgstr "Dien�"
 
 #: 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 "Penktadienis"
 
@@ -4141,7 +4211,7 @@ msgid "Minutes"
 msgstr "Minu�i�"
 
 #: 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 "Pirmadienis"
 
@@ -4151,7 +4221,7 @@ msgid "S_un"
 msgstr "_Sek"
 
 #: 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 "�e�tadienis"
 
@@ -4164,7 +4234,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Rodyti savai�i� _numerius datos navigatoriuje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Sekmadienis"
 
@@ -4183,7 +4253,7 @@ msgid "Task List"
 msgstr "_U�duo�i� s�ra�as"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
@@ -4200,7 +4270,7 @@ msgid "Time format:"
 msgstr "Laiko formatas:"
 
 #: 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 "Antradienis"
 
@@ -4209,7 +4279,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 "Tre�iadienis"
 
@@ -4435,8 +4505,8 @@ msgid "No summary"
 msgstr "N�ra ap�valgos"
 
 #: 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 "I�saugoti kaip..."
 
@@ -4505,27 +4575,27 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "�vesti, kam pavedama"
 
-#: 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 "�vykis"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "U�uomina"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Pasikartojimas"
 
-#: 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 "Dienotvark�"
 
-#: 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 "Susitikimas"
 
@@ -4597,20 +4667,20 @@ msgstr "P_abaigos laikas:"
 msgid "_Start time:"
 msgstr "_Prad�ios laikas:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Organizatorius yra b�tinas."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 #, fuzzy
 msgid "At least one attendee is required."
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Tas asmuo jau dalyvauja susitikime!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Pavesti kam..."
 
@@ -4650,7 +4720,7 @@ msgid "Member"
 msgstr "Narys"
 
 #: 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 +4732,7 @@ msgstr "Rol�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "B�sena"
@@ -4738,48 +4808,48 @@ msgstr "-�"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�iame �vykyje yra pasikartojim�, kuri� Evolution negali keisti."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "lygiai"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "s�ra�as"
 
-#: 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 "Kitas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "�iaur�s"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "s�ra�as"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Kitas faksas"
 
-#: 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 "diena"
 
-#: 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 "kart�(us) pasitaikys"
 
@@ -4873,7 +4943,7 @@ msgstr "U�baigimo data:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c: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 "Reikalauja veiksmo"
 
@@ -4882,7 +4952,7 @@ msgid "Progress"
 msgstr "Pa�anga"
 
 #: 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:"
 
@@ -4894,17 +4964,17 @@ msgstr "_Svarbumas:"
 msgid "_Status:"
 msgstr "_B�sena:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Esm�"
 
-#: 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 "Priskyrimas"
 
-#: 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:"
@@ -4974,13 +5044,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 "I�trinti pa�ym�tus kontaktus"
 
-#: 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 "Ati_daryti"
@@ -4990,30 +5060,30 @@ msgstr "Ati_daryti"
 msgid "_Save as..."
 msgstr "I�saugoti kaip..."
 
-#: 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_pausdinti..."
 
-#: 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 "_I�kirpti"
 
-#: 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 "_Kopijuoti"
 
-#: 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"
@@ -5042,12 +5112,12 @@ msgstr "_Pa�ym�ti u�duotis u�baigtomis"
 msgid "_Delete Selected Tasks"
 msgstr "_I�trinti pa�ym�tas u�duotis"
 
-#: 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 "Spausk �ia, kad prid�tum u�duot�"
@@ -5056,8 +5126,8 @@ msgstr "Spausk �ia, kad prid�tum u�duot�"
 msgid "Alarms"
 msgstr "Persp�jimai"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c: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 "U�baigta"
 
@@ -5086,7 +5156,7 @@ msgid "Start Date"
 msgstr "Prad�ios data"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Ap�valga"
@@ -5153,480 +5223,486 @@ msgstr " "
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Naujas �_vykis"
 
-#: 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 "Naujas visos _dienos �vykis"
 
-#: 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 "Susitikimas"
 
-#: 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 "Nauja u�duotis"
 
-#: 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 "Spausdinti..."
 
-#: 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 "Eiti � �ia_ndien�"
 
-#: 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 "_Eiti � dat�..."
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: 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 "Konfig�ruoti aplank�..."
 
-#: 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 "Konfig�ruoti aplank�..."
 
-#: 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 "I�_saugoti kaip..."
 
-#: 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 "�traukti s_usitikim� � dienotvark�"
 
-#: 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 "Persi�sti kaip 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 "Leisti per_kelti �� pasitaikym�"
 
-#: 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 "I�trinti �� _pasitaikym�"
 
-#: 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 "I�trinti _visus pasitaikymus"
 
-#: 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 "Atrodo, kad GNOME Pilot �rankiai n�ra �diegti � �i� sistem�"
 
-#: 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 "Klaida vykdant %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 "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "U�baigta "
 
-#: 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 "kalendoriaus informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Kalendorius"
 
-#: 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 "ne�inomas siunt�jas"
 
 #. 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"
 "Geogr. vietov�: "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_B�sena:"
 
-#: 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 "Priimtas"
 
-#: 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 "Negalutinis"
 
-#: 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 "Atmestas"
 
-#: 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 "Ne�inomas"
 
-#: 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 "Pasirink veiksm�"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: 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 "Gerai"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 #, fuzzy
 msgid "Accept"
 msgstr "Priimtas"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 #, fuzzy
 msgid "Decline"
 msgstr "Atmestas"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: 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 "Susitikimo informacija"
 
-#: 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 "Nutraukti"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Susitikimo informacija"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Susitikimas"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Susitikimas"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Susitikimo informacija"
 
-#: 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 "Ie�koti lai�ke"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Task Information"
 msgstr "Informacija"
 
-#: 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 "Susitikimas"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 #, fuzzy
 msgid "Task Update"
 msgstr "buvo po"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 #, fuzzy
 msgid "Task Update Request"
 msgstr "buvo po"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 #, fuzzy
 msgid "Task Reply"
 msgstr "Atsakyti"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Nutraukti veiksm�"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Kalendoriaus �inut�"
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "_Laisvas-u�si�m�s URL"
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "_Laisvas-u�si�m�s URL"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Praeit� lai�k�"
 
-#: 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 "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "�iame lai�ke yra tik Bcc gav�jai."
 
-#: 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
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "�vyko klaida parsiun�iant naujien� �altin�"
 
-#: 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 "Elementas negal�jo b�ti i�si�stas!\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 "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Atnaujinimas u�baigtas\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendoriaus byla negal�jo b�ti atnaujinta!\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 "Negal�jau atidaryti aplanko su �%s�"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Dalyvio b�sena atnaujinta\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 "Dalyvio b�sena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Pa�alinimas u�baigtas"
 
-#: 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 "Elementas i�si�stas!\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 "Elementas negal�jo b�ti i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Pasirink aplank�"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Pasirink aplank�"
@@ -5672,7 +5748,7 @@ msgstr "prad�ios-data"
 msgid "Chair Persons"
 msgstr "Pirmininkaujantys asmenys"
 
-#: 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 "B�tini dalyviai"
 
@@ -5686,52 +5762,52 @@ msgid "Resources"
 msgstr "Resursas"
 
 #: 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 "Individas"
 
 #: 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 "Grup�"
 
 #: 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 "Resursas"
 
 #: 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 "Kambarys"
 
 #: 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 "Pirmininkas"
 
 #: 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 "B�tinas dalyvis"
 
 #: 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 "Neb�tinas dalyvis"
 
 #: 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 "Ne dalyvis"
 
 #: 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 "Negalutinis"
 
 #: 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 "Pavestas"
 
@@ -5821,43 +5897,50 @@ msgstr "Susitikimo _prad�ios laikas:"
 msgid "Meeting _end time:"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: 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 "Atidaromos u�duotys i� %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 "Negal�jau �kelti u�duo�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 "Metodas, reikalingas �kelti �%s�, nepalaikomas"
 
-#: 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 "Negal�jau atidaryti aplanko su �%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 "Klaida pradedant %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "U�baigimo data"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "I�trinti pa�ym�tus kontaktus"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "I�valyti"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Naujas �_vykis..."
 
@@ -5871,7 +5954,13 @@ msgstr "Negal�jau atidaryti aplanko su �%s�"
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti �%s�, nepalaikomas"
 
-#: 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 "Persp�ti %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5879,7 +5968,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"
@@ -5887,12 +5976,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 "Atidaromas kalendorius i� %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Atidaromas aplankas %s"
@@ -5953,55 +6042,65 @@ msgstr "Spalis"
 msgid "September"
 msgstr "Rugs�jis"
 
-#: 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 "Turi b�ti nurodytas organizatorius."
+
+#: calendar/gui/itip-utils.c:393
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/itip-utils.c:392
-msgid "An organizer must be set."
-msgstr "Turi b�ti nurodytas organizatorius."
-
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 #, fuzzy
 msgid "Event information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "Informacija"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "Neb�tina informacija"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 msgid "Calendar information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Data"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Atnaujinti s�ra��"
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "kalendoriaus informacija"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Tu turi b�ti �vykio dalyvis."
 
@@ -6242,7 +6341,7 @@ msgid "Print Calendar"
 msgstr "Spausdinti kalendori�"
 
 #: 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 "Spaudinio per�i�ra"
@@ -6267,7 +6366,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "Vaizduojamo u�duo�i� aplanko 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 "
@@ -6280,12 +6379,12 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: 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 "Kit� kart� nebeklausti."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Spausdinti korteles"
@@ -6355,17 +6454,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Negal�jau prisijungti prie serverio: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "U�uomina"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendoriaus �inut�"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6374,115 +6473,120 @@ msgstr ""
 "Evolution rado Pine pa�to byl�.\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Atidaryti kalendori�"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now tikisi 0 argument�"
 
-#: 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 "is-completed? tikisi 0 argument�"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? tikisi 1 argumento"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? tikisi, kad pirmas argumentas bus 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 "Paie�kos i�rai�kos �vertinimas nedav� login�s reik�m�s"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Kita klaida"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8136,82 +8240,82 @@ msgstr "�ra�omas aplankas '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Tu turi dirbti prisijung�s, kad u�baigtum �� veiksm�"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
-#: 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 "Klaida nagrin�jant filtr�: %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 "Klaida vykdant filtr�: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Negaliu atidaryti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Negaliu apdoroti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Gaunamas lai�kas %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: 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 "Nes�km� ties lai�ku %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 "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Blogi argumentai"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Blogi argumentai"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-filter-search.c:547
+#: camel/camel-filter-search.c:550
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-filter-search.c: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 "Klaida vykdant filtro paie�k�: %s: %s"
@@ -8262,11 +8366,11 @@ msgstr ""
 "Klaida vykdant paie�kos i�rai�k� �%s�:\n"
 "%s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Perkeliami lai�kai"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Lai�kai kopijuojami � %s"
@@ -8581,7 +8685,7 @@ msgid ""
 msgstr "Negal�jau sukurti pipe: %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 "Blogas autentikacijos atsakymas i� serverio."
 
@@ -8642,51 +8746,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nepavyko sukompiliuoti reguliarios i�rai�kos: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL �%s� turi b�ti su vartotojo vardu"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL �%s� turi b�ti su hostu"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL �%s� turi b�ti su keliu"
 
-#: 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 "Atsakymo adresas:"
 
-#: 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 ""
 
@@ -8882,7 +8986,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"
@@ -8891,11 +8995,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 ""
 
@@ -8917,7 +9021,7 @@ msgstr ""
 "Ar nori priimti vis tiek?"
 
 #. 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"
@@ -8972,68 +9076,76 @@ msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: N�ra tokio aplanko"
 
-#: 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 "Veiksmas nutrauktas"
 
-#: 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 "Serveris netik�tai atsijung�: %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 "Netik�tas atsakymas i� IMAP serverio: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Netik�tas atsakymas i� IMAP serverio: %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 "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Serverio atsakymas baig�si per anksti."
 
-#: 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 serverio atsakyme nebuvo %s informacijos"
 
-#: 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 "Netik�tas atsakymas OK i� IMAP serverio: %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 "Negal�jau sukurti katalogo %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 "Nepavyko �kelti %s santraukos"
 
-#: 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 "Aplankas serveryje buvo sunaikintas ir v�l sukurtas."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Ie�koma pakeist� lai�k�"
 
-#: 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 "Nepavyko i�koduoti lai�ko."
 
-#: 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
@@ -9049,28 +9161,24 @@ msgstr ""
 "Negaliu gauti lai�ko: %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 "N�ra tokio lai�ko"
 
-#: 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 "�is lai�kas �iuo metu nepasiekiamas"
 
-#: 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 "Ie�koma nauj� lai�k�"
-
-#: 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 "Negal�jau rasti lai�ko teksto FETCH atsakyme"
 
@@ -9087,6 +9195,11 @@ msgstr "Negal�jau atidaryti ke�o katalogo: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Nepavyko i�koduoti lai�ko."
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Nepavyko i�koduoti lai�ko."
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Tikrinama, ar yra nauj� lai�k�"
@@ -9135,77 +9248,72 @@ msgstr ""
 "Su �ia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
 "teksto slapta�odis."
 
-#: 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 serveris %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 serveris %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 "Jungtis nutraukta"
 
-#: 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 "Negal�jau prisijungti prie %s (prievadas %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 ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant vartotojo vard�: %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 "Veiksmas nepalaikomas"
 
-#: 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 "Autentikacija nepavyko."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Aplankas n�ra tu��ias"
-
-#: 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 serveris %s nepalaiko pra�yto autentikacijos tipo %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 "Nepalaikoma %s tipo autentikacija"
 
-#: 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 "%sPra�om �vesti IMAP slapta�od� d�l %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 "Tu ne�vedei slapta�od�io."
 
-#: 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"
@@ -9215,24 +9323,24 @@ msgstr ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\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 "N�ra tokio aplanko %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 "Aplanko varde negali b�ti Return simbolio."
 
-#: 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 "Ne�inoma klaida: %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 "T�vinis aplankas negali tur�ti vaikini� aplank�"
 
@@ -9308,8 +9416,8 @@ msgid ""
 msgstr "Vietinio pa�to skaitymui ir laikymui standartin�se mbox bylose"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c: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 "Saugyklos �aknis %s n�ra absoliutus kelias"
@@ -9321,7 +9429,7 @@ msgstr "Saugyklos �aknis %s n�ra n�ra paprastas katalogas"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Negal�jau gauti aplanko �%s�: %s"
@@ -9335,32 +9443,32 @@ msgstr "Vietin�se saugyklose n�ra inbox"
 msgid "Local mail file %s"
 msgstr "Vietin� pa�to byla %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 "Negal�jau pervadinti aplanko �%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 "Negal�jau pervadinti aplanko: %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 "Negal�jau i�trinti aplanko santraukos bylos �%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 "Negal�jau i�trinti aplanko indekso bylos �%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 "Negal�jau i�saugoti santraukos: %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 "Nepavyko prid�ti lai�ko � santrauk�: ne�inoma prie�astis"
 
@@ -9381,6 +9489,7 @@ msgstr "Blogas lai�ko turinys"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9392,12 +9501,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 "N�ra tokio aplanko �%s�."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9423,7 +9534,8 @@ msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
 #: 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 ""
@@ -9455,7 +9567,7 @@ msgid "Storing folder"
 msgstr "�ra�omas aplankas"
 
 #: 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 "Negaliu sukurti aplanko u�rakto ant %s: %s"
@@ -9626,40 +9738,45 @@ msgstr "�%s� n�ra katalogas."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Negaliu atidaryti MH katalogo kelio: %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 aplank� negalima pervadinti"
 
-#: 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 "Saugyklos �aknis %s n�ra n�ra paprastas katalogas"
 
-#: 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 "N�ra tokio aplanko �%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� n�ra paprasta byla."
+
+#: 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 pa�to byla %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 aplank� negalima pervadinti"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Spool aplank� negalima pervadinti"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Spool aplank� negalima i�trinti"
 
@@ -9751,50 +9868,50 @@ msgstr "Nutraukti"
 msgid "Operation failed: %s"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Parsiun�iama POP santrauka"
 
-#: 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 "Veiksmas nutrauktas"
 
-#: 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 "Negal�jau gauti aplanko �%s�: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Sunaikinami i�trinti lai�kai"
 
-#: 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 "N�ra lai�ko su uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Parsiun�iamas POP lai�kas %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 ""
 "Negaliu gauti lai�ko: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Ne�inoma klaida"
@@ -10069,45 +10186,45 @@ msgstr "Laikina autentikacijos nes�km�"
 msgid "Authentication required"
 msgstr "Autentikacija b�tina"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET atsakymo klaida: %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 ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant vartotojo vard�: %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 "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: 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 "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET atsakymo klaida: %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 serveris %s nepalaiko pra�yto autentikacijos tipo %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 "%sPra�om �vesti SMTP slapta�od� d�l %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"
@@ -10117,90 +10234,90 @@ msgstr ""
 "Negal�jau autentikuotis � SMTP server�.\n"
 "%s\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 serveris %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 pa�to siuntimas per %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 "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
 
-#: 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 "Siun�iamas lai�kas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: 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 "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP pasveikinimas"
 
-#: 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 "Baig�si RSET u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP autentikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Klaida sukuriant SASL autentikacijos objekt�."
 
-#: 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 "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH u�klausa nepavyko."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Blogas autentikacijos atsakymas i� serverio.\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 "Baig�si MAIL FROM u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: 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 atsakymo klaida: %s: pa�tas nei�si�stas"
 
-#: 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 "Baig�si RCPT TO u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: 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 "Baig�si DATA u�klausos laiko riba: %s: pa�tas nei�si�stas"
@@ -10208,81 +10325,72 @@ msgstr "Baig�si DATA u�klausos laiko riba: %s: pa�tas nei�si�stas"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET atsakymo klaida: %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 ""
 "Baig�si DATA siuntimo laiko riba: lai�ko nutraukimas: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
-#: 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 "Baig�si RSET u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET atsakymo klaida: %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 "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 baitas"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u bait�"
-
-#: 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 "priedas"
 
-#: 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 "Pa�alinti pa�ym�tus elementus i� pried� s�ra�o"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Prisegti pried�..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Prisegti byl� prie �io lai�ko"
 
@@ -10314,7 +10422,7 @@ msgstr "MIME tipas:"
 msgid "Suggest automatic display of attachment"
 msgstr "Pasi�lyti automatin� priedo parodym�"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Paspausk �ia, jei reikia adres� knygel�s"
 
@@ -10325,45 +10433,45 @@ msgstr "Paspausk �ia, jei reikia adres� knygel�s"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Atsakyti-kam:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Nuo:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "�vesk lai�ko gav�jus"
 
-#: 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 "�vesk adresus, kurie gaus �io lai�ko carbon copy"
 
-#: 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."
@@ -10374,12 +10482,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "_Prievadas:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "apra�ymas"
@@ -10394,7 +10502,7 @@ msgstr "Prisegti byl�"
 msgid "Could not create a PGP signature context"
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10403,34 +10511,34 @@ msgstr ""
 "Klaida skaitant byl� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "�sp�jimas!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Byla egzistuoja, u�ra�yti?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida i�saugant byl�: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida �keliant byl�: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti lai�ko i� redaktoriaus"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10439,7 +10547,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10448,7 +10556,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10457,7 +10565,7 @@ msgstr ""
 "Klaida automati�kai i�saugant lai�k�: %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?"
@@ -10465,34 +10573,56 @@ msgstr ""
 "Ximian Evolution rado nei�saugot� byl� i� praeitos sesijos.\n"
 "Ar nor�tum pabandyti jas atkurti?"
 
-#: 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 ""
+"�is lai�kas nebuvo i�si�stas.\n"
+"\n"
+"Ar nor�tum i�saugoti jo pakeitimus?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "�sp�jimas: Pakeistas lai�kas"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Atidaryti byl�"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "I�saugoti para��"
 
-#: 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 "Sukurti lai�k�"
 
-#: 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 ""
+"Negal�jau sukurti ra�ykl�s lango:\n"
+"Nepavyko aktyvuoti HTML redaktoriaus komponento."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10500,13 +10630,13 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: 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."
@@ -10514,8 +10644,9 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango, nes tu dar nenurodei\n"
 "jokios asmenyb�s pa�to komponente."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Negal�jau inicializuoti Evolution ra�ykl�s."
 
 #: data/evolution.desktop.in.h:1
@@ -10567,8 +10698,8 @@ msgstr "Tema savyje turi"
 msgid "Subject does not contain"
 msgstr "Tema savyje neturi"
 
-#: 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?"
@@ -10717,7 +10848,8 @@ msgid "years"
 msgstr "met�"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Tu u�mir�ai pasirinkti dat�."
 
 #: filter/filter-datespec.c:269
@@ -10773,15 +10905,12 @@ msgid "Add action"
 msgstr "Prid�ti veiksm�"
 
 #: 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 ""
-"Tu pamir�ai pasirinkti aplank�.\n"
-"Pra�au, gr��k atgal ir nurodyk tikr� aplank�, � kur� perkelti lai�kus."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Stiliaus vardas:"
 
-#: 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 "Pasirink aplank�"
 
@@ -10794,7 +10923,7 @@ msgstr ""
 "Klaida reguliarioje i�rai�koje �%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 "Svarbus"
@@ -10983,226 +11112,230 @@ msgid "Beep"
 msgstr "Belizas"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "turi savyje"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopijuoti � aplank�"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Gavimo data"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Siuntimo data"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "I�trintas"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "neturi savyje"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nesibaigia"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "neegzistuoja"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "neegzistuoja"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "neskamba pana�iai �"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "neprasideda su"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "neegzistuoja"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Juodra�tis"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "baigiasi su"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Egzistuoja"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "egzistuoja"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "I�rai�ka"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "yra"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "buvo po"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "buvo prie�"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "yra didesnis u�"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "yra ma�esnis u�"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "n�ra"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "n�ra"
-
-#: 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 "Konferencija"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Lai�ko tekstas"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Lai�ko antra�t�"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Perkelti � aplank�"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Si�sti lai�k� kontaktui"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Groti gars�:"
 
-#: 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 "Skaitytas"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Gav�jai"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Regex tenkina"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Atsakytas"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Darb"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "yra didesnis u�"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "yra ma�esnis u�"
+#: 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 "�vertis"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Siunt�jas"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Priskirti b�sen�"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Kompanijos"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Dydis (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "skamba pana�iai �"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "�altinio s�skaita"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Savita antra�t�"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "prasideda su"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdym�"
 
-#: 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 "Tema"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Priskirti b�sen�"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "turi savyje"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "neturi savyje"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "nesibaigia"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "neegzistuoja"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "neegzistuoja"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "neskamba pana�iai �"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "neprasideda su"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "baigiasi su"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "egzistuoja"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "buvo po"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "buvo prie�"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "yra didesnis u�"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "yra ma�esnis u�"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "n�ra"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "n�ra"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "yra"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "yra didesnis u�"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "yra ma�esnis u�"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Darb"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "skamba pana�iai �"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "prasideda su"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Taisykl�s"
@@ -11237,31 +11370,31 @@ msgstr "Tu turi nurodyti bent vien� aplank� kaip �altin�"
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuoja tavo sen� Elm pa�t�"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importuojama..."
 
-#: 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 "Pra�ome palaukti"
 
-#: 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 "Importuojama %s kaip %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 "Skanuojama %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 "Pa�tas"
 
@@ -11322,39 +11455,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 importuoja tavo senus Netscape duomenis"
 
 #. 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 "�iuk�l�s"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Vietin� pa�to byla %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 "Skanuojamas katalogas"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Pradedama importuoti"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Keisti filtrus"
 
-#: 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?"
@@ -11475,105 +11608,116 @@ msgid "Folder containing mail"
 msgstr "Aplankas, kuriame yra lai�kai"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Vie�as"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Aplankas, kuriame yra lai�kai"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Virtuali �iuk�lin�"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Virtualus �iuk�lin�s aplankas"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "�iame aplanke negali b�ti lai�k�."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Savyb�s..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Pakeisti �io aplanko savybes"
 
-#: 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 "Tu nenustatei pa�to siuntimo metodo"
 
-#: 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 "�sp�jimas: Pakeistas lai�kas"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Naujas pa�to lai�kas"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Pa�to lai�kas"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Sukurti lai�k�"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Kit� lai�k�"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "S_pausdinti lai�k�"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Naujas pa�to lai�kas"
 
-#: 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 "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Jungiamasi prie serverio..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Negaliu u�registruoti saugyklos apvalkale"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�%s� savyb�s"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Savyb�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 "Negal�jau sukurti laikino katalogo: %s"
@@ -11618,140 +11762,140 @@ msgstr "%d i�si�sti"
 msgid "%d total"
 msgstr "%d i� viso"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Tem�"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_nt�j�"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gav�jus"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferencij�"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_em�"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_unt�j�"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_v�jus"
 
-#: 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 "Filtras pagal K_onferencij�"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip nauj� lai�k�..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: 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 "_Atsakyti siunt�jui"
 
-#: 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 "Atsakyti � _konferencij�"
 
-#: 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 "Atsakyti _visiems"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "P_ersi�sti"
 
-#: 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 "U�baigta"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "I�valyti"
 
 #. 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 "Pa�ym�ti s_kaitytu"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Pa�ym�ti svarb_iu"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Pa�ym�ti nesva_rbiu"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "S_ugr��inti"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Perkelti � aplank�..."
 
-#: 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_opijuoti � aplank�..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Prid�ti siunt�j� � adres� knygel�"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sukurti _taisykl� i� lai�ko"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "vAplankas pagal Konferencij�"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtras pagal Konferencij� (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vAplankas pagal Konferencij� (%s)"
@@ -11825,20 +11969,20 @@ msgstr "Tu ne�vedei visos b�tinos informacijos."
 msgid "Evolution Account Editor"
 msgstr "Evolution s�skait� tvarkykl�"
 
-#: 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 "_Hostas:"
 
-#: 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 "_Vartotojo vardas:"
 
-#: 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 "_Kelias:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Tu negali sukurti dviej� aplank� tuo pa�iu vardu."
 
@@ -11855,14 +11999,14 @@ msgid "Really delete account?"
 msgstr "Ar tikrai i�trinti s�skait�?"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c: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 "I�jungti"
 
 #: 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 "�jungti"
 
@@ -11951,9 +12095,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 ""
 "Tu siunti HTML formatuot� lai�k�, bet sekantys gav�jai nem�gsta HTML "
 "formatuoto pa�to:\n"
@@ -11994,7 +12139,7 @@ msgstr "Gali b�ti, kad pa�to serveris"
 msgid "You must specify recipients in order to send this message."
 msgstr "Tu turi nurodyti gav�jus, kad gal�tum i�si�sti �� lai�k�."
 
-#: mail/mail-callbacks.c: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?"
@@ -12002,28 +12147,28 @@ msgstr ""
 "Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
 "Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "ne�inomas siunt�jas"
 
-#: 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 ra��:"
 
-#: 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 "Perkelti lai�k�(us) �"
 
-#: 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 "Kopijuoti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ar tu tikrai nori taisyti visus %d lai�kus?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12031,7 +12176,7 @@ msgstr ""
 "Tu gali taisyti tik lai�kus, esan�ius \n"
 "Juodra��i� aplanke."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12039,39 +12184,39 @@ msgstr ""
 "Tu gali i� naujo pasi�sti lai�kus\n"
 "tik i� Sent aplanko."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ar tu tikrai nori v�l si�sti visus %d lai�kus?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Joks lai�kas nepa�ym�tas"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "U�ra�yti byl�?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "I�saugoti lai�k� kaip..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "I�saugoti lai�kus kaip..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Parodyti kit� neskaityt� lai�k�"
 
-#: 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"
@@ -12083,7 +12228,7 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12092,64 +12237,64 @@ msgstr ""
 "Klaida, �keliant filtro informacij�:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Spausdinti lai�k�"
 
-#: 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 "Nepavyko atspausdinti lai�ko"
 
-#: 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 "Ar tu tikrai nori atidaryti visus %d lai�kus atskiruose languose?"
 
-#: 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 "apra�ymas"
 
-#: 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 "Bevardis kontaktas"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Si�sti"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Prid�ti s�lyg�"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "I�saugoti para��"
@@ -12208,16 +12353,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution s�skait� pad�j�jas"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "S�skaita"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
 
-#: 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 "Jungiamasi prie serverio..."
 
@@ -12938,78 +13083,74 @@ msgstr "Negal�jau sukurti ra�ykl�s lango."
 msgid "Could not create a S/MIME decode context."
 msgstr "Negal�jau sukurti ra�ykl�s lango."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "I�saugoti pried�"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "I�saugoti pried�"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "�i�r�ti viduje"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "�i�r�ti viduje (per %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Sl�pti"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "I�orin� �i�rykl�"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "�kelt_i paveiksl�lius"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "�keliamas lai�ko turinys"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "_V�luojamos u�duotys:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %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 "Nuorod� atidaryti nar�ykl�je"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopijuoti nuorodos adres�"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "I�saugoti nuorod� kaip (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "I�saugoti paveiksl�l� kaip..."
 
@@ -13018,51 +13159,52 @@ msgstr "I�saugoti paveiksl�l� kaip..."
 msgid "Pinging %s"
 msgstr "Skanuojama %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Negal�jau i�nagrin�ti MIME lai�ko. Rodomas �altinis."
 
-#: 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 "Blogas adresas"
 
-#: 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 "Nuo"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Atsakyti-kam"
 
-#: 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 "Kam"
 
-#: 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"
 "Pa�to programa: "
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
@@ -13070,63 +13212,63 @@ msgstr ""
 "�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
 "jis autenti�kas"
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Negal�jau prisijungti prie POP serverio %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 ""
 "�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
 "jis autenti�kas"
 
-#: 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 ""
 "�is lai�kas yra pasira�ytas skaitmeniniu para�u, bet neina patikrinti, ar "
 "jis autenti�kas"
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodykl� � FTP svetain� (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Rodykl� � vietin� byl� (%s), galiojanti svetain�je �%s�"
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodykl� � vietin� byl� (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodykl� � nutolusius duomenis (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodykl� � ne�inomus i�orinius duomenis (�%s� tipo)"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota i�orinio k�no dalis."
 
-#: 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 "Ypatingi aplankai"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "I� naujo konfig�ruojamas aplankas"
 
-#: 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"
@@ -13135,29 +13277,24 @@ msgstr ""
 "Negaliu i�saugoti metainfo. Tikriausiai tau daugiau\n"
 "nebepavyks atidaryti �io aplanko: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Kei�iamas aplanko �%s� formatas � �%s�"
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s negalima perkonfig�ruoti, nes tai n�ra vietinis aplankas"
-
-#: 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."
@@ -13165,15 +13302,15 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti �ios pa�to\n"
 "d��ut�s, tau teks sutaisyti j� rankut�mis."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Tu negali pakeisti nevietinio aplanko formato."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "V�l konfig�ruoti %s"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "Tu negali pakeisti nevietinio aplanko formato."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13414,21 +13551,21 @@ msgstr "Laukiama..."
 msgid "User canceled operation."
 msgstr "Vartotojas nutrauk� veiksm�."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Prisiminti �� slapta�od�"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Prisiminti �� slapta�od� iki �ios sesijos galo"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "�vesk %s slapta�od�"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "�vesk slapta�od�"
 
@@ -13437,11 +13574,11 @@ msgstr "�vesk slapta�od�"
 msgid "Could not save signature file: %s"
 msgstr "Negal�jau i�saugoti para�o bylos."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "I�saugoti para��"
 
-#: 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"
@@ -13451,14 +13588,12 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti pakeitimus?"
 
-#: mail/mail-signature-editor.c:371
+#: mail/mail-signature-editor.c:372
 #, fuzzy
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
-"Pasirink pavadinim�, kuriuo nor�tum vadinti �iuos serverius. Pavyzd�iui, "
-"�Namai� ar �Darbas�."
+msgid "Enter a name for this signature."
+msgstr "_HTML para�as:"
 
-#: 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 "Vardas:"
 
@@ -13498,7 +13633,7 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: 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 "vAplankai"
 
@@ -13529,67 +13664,67 @@ msgstr "(N�ra temos)"
 msgid "%s - Message"
 msgstr "%s - Lai�kas"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematyt� lai�k�"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Keletas lai�k�"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "�emiausias"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "�emesnis"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Auk�tesnis"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Auk��iausias"
 
-#: 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 "�iandien %H:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %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 "%b %d %H:%M"
 
-#: 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 "Generuojamas lai�k� s�ra�as"
 
@@ -13663,45 +13798,71 @@ msgstr "Atsakyti visiems"
 msgid "Review"
 msgstr "Per�i�ra"
 
-#: 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 "U�baigta"
+
+#: 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 "I�valyti"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "_Kada reikia:"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Bylos vardas:"
+
+#: mail/subscribe-dialog.c:229
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "U�sakomas aplankas �%s�"
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atsisakoma aplanko �%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 "Aplankas"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "I�saugoti � aplank�..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Joks serveris nepasirinktas"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Pra�om pasirinkti server�."
 
@@ -24613,12 +24774,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "apra�ymas"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Pa�to ap�valga"
 
-#: 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 "Ypatingi aplankai"
@@ -24629,23 +24790,23 @@ msgstr "Ypatingi aplankai"
 #. (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 "Dictionary.com Dienos �odis"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Dienos citatos"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Prid�ti naujien� �altin�"
 
-#: 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 "�vesk URL naujien� �altinio, kur� nori prid�ti"
 
@@ -24684,12 +24845,12 @@ msgstr "(N�ra apra�ymo)"
 msgid "My Weather"
 msgstr "Mano orai"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "�vyko klaida parsiun�iant naujien� �altin�"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Orai"
 
@@ -26025,6 +26186,11 @@ msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Atidaryti su %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -26256,12 +26422,25 @@ msgid "Rename folder"
 msgstr "Pervadinti aplank�"
 
 #: 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 "Nurodytas aplanko vardas yra negalimas: %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 ""
+"Negal�jau pervadinti aplanko:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -26270,12 +26449,12 @@ msgstr ""
 "Negaliu sukurti nurodyto aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Sukurti _nauj� aplank�..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Naujas..."
 
@@ -26307,20 +26486,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Pra�om pasirinkti informacij�, kuri� nor�tum importuoti"
 
-#. 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 ""
-"Importuojama %s\n"
-"Importeris nepasiruo��s.\n"
-"Laukiu 5 sekundes kol bandysiu v�l."
-
-#: 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"
@@ -26329,23 +26495,23 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Pasirink aplank�"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "N�ra tokios bylos %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
 #, 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"
@@ -26354,11 +26520,11 @@ msgstr ""
 "N�ra importerio, kuris gal�t� suprasti\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importuojama"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26367,17 +26533,17 @@ msgstr ""
 "Importuojama %s.\n"
 "Pradedama %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Klaida pradedant %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Klaida �keliant %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26386,31 +26552,31 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automati�kas"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Bylos vardas:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Pasirink byl�"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Bylos tipas:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Importuoti duomenis ir nuostatas i� kit� program�"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importuoti vien� byl�"
 
-#: 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"
@@ -26418,24 +26584,24 @@ msgstr ""
 "Pra�ome palaukti...\n"
 "Ie�koma esam� nustatym�"
 
-#: 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 "Paleid�iami inteligenti�ki importeriai"
 
-#: 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 "Nuo %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Pasirink aplank�"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Pasirink aplank�, � kur� importuoti �iuos duomenis"
 
-#: 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 "Importuoti"
 
@@ -26461,32 +26627,32 @@ msgstr "Sinchronizuojamas aplankas"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Sinchronizuojamas '%s'"
 
-#: 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 "Atidaromas aplankas %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 "Atidaromas aplankas %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 "Atidaryti su %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 "Negal�jau pervadinti aplanko: %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 ""
@@ -26528,45 +26694,45 @@ msgstr "�iame aplanke negali b�ti lai�k�."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ir '..' yra rezervuoti katalog� vardai."
 
-#: 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 nerastas tavo kelyje ($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 negal�jo b�ti paleistas."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Apie Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Eiti � aplank�..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Pasirink aplank�, kur� nor�tum atidaryti"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Sukurti nauj� trump�"
 
-#: 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 "Pasirink aplank� � kur� nor�tum, kad trump� rodyt�:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 #, fuzzy
 msgid "_Work Online"
 msgstr "Dirbti atsijungus"
 
-#: 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 "_Dirbti atsijungus"
 
-#: 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 "Dirbti atsijungus"
 
@@ -26574,27 +26740,27 @@ msgstr "Dirbti atsijungus"
 msgid "(No folder displayed)"
 msgstr "(Joks aplankas nerodomas)"
 
-#: 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 "(Jokio)"
 
-#: 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 dabar yra prisijungusi.  Paspausk �� mygtuk�, kad dirbtum "
 "atsijungus."
 
-#: 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 dabar yra atsijungimo procese."
 
-#: 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 ""
@@ -26613,12 +26779,12 @@ msgstr ""
 "Klaida i� aktyvavimo sistemos yra:\n"
 "%s"
 
-#: 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"
@@ -26626,19 +26792,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Negaliu u�siregistruoti OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Konfig�racijos duombaz� nerasta"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
@@ -26778,58 +26944,62 @@ msgstr "Trump�s"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "N�ra klaid�"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat pavadinimu"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Neu�tenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Aplankas n�ra tu��ias"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ne�gyvendinta �ioje saugykloje"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nurodytas aplankas negali b�ti pakeistas ar i�trintas"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Negalima padaryti aplanko vaiku vienu i� savo palikuoni�"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Negaliu sukurti aplanko su tokiu vardu"
 
+#: 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 (...)"
@@ -27045,7 +27215,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 ""
@@ -27059,26 +27229,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolution importavimo pad�j�jas"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution importavimo pad�j�jas"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Importuoti byl� (�ingsnis 3 i� 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Importerio tipas (�ingsnis 1 i� 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Pasirinkti importerius (�ingsnis 2 i� 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Pasirinkti byl� (�ingsnis 2 i� 3)"
 
-#: shell/importer/import.glade.h:8
+#: shell/importer/import.glade.h:7
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -27316,10 +27482,10 @@ msgstr "esamas laikas"
 #: 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 "_Veiksmai"
 
@@ -27439,7 +27605,7 @@ msgid "Print this item"
 msgstr "Spausdinti �� element�"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "I�saugoti"
 
@@ -27466,7 +27632,7 @@ msgstr "I�saugoti �� element� � disk�"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Byla"
 
@@ -27551,7 +27717,8 @@ msgid "Schedule a meeting for this item"
 msgstr "�ra�yti susitikim� � dienotvark�"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Prisitaikyti Mano Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -27601,29 +27768,30 @@ msgid "Post a message to a Public folder"
 msgstr "Kopijuoti lai�k� � nauj� aplank�"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_U�sisakyti aplankus..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Rodyti lai�ko per�i�ros lang�"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "U�sisakyti ar atsisakyti aplank� nutolusiuose serveriuose"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Virtuali� aplank� taisymas..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtrai..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_Per�i�ros sritis"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_U�sisakyti aplankus..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Keisti �io aplanko savybes"
@@ -27717,7 +27885,7 @@ msgstr "Gijomis suskirstytas lai�k� s�ra�as"
 msgid "_Expunge"
 msgstr "I�_valyti"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Aplankas"
 
@@ -28032,7 +28200,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Ie�koti eilut�s rodomo lai�ko tekste"
 
 #: 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 "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -28146,7 +28315,7 @@ msgstr "Cituojant"
 msgid "_Resend..."
 msgstr "Pe_rvadinti..."
 
-#: 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 "�ran_kiai"
 
@@ -28161,12 +28330,12 @@ msgstr "U�daryti �� lang�"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_U�daryti"
 
 #: 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 "_Rodyti"
 
@@ -28342,7 +28511,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "I�saugoti element� ir u�daryti dialogo lang�"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Pagalba"
 
@@ -28511,7 +28680,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Sukurti _nauj� aplank�..."
 
 #: 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
@@ -28528,114 +28697,134 @@ msgid "Pi_lot Settings..."
 msgstr "_Pilot nuostatos..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "_Pilot nuostatos..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Sukurti _nauj� aplank�..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Si�sti / Gauti"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "I�si�sti laukiant� pa�t� ir parsi�sti nauj� pa�t�"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Pa�to nustatymas"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Pa�to nustatymas"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Rodyti informacij� apie Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "I�si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "I�_si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Prane�ti apie klaid�, naudojant Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Perjungti"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Perjungti, ar rodyti aplank� juost�"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Perjungti, ar rodyti trumpi� juost�"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Perjungti, ar dirbama atsijungus."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Rodyti parinkt� aplank�"
 
-#: 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 "_Apie Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Kopijuoti..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Aplank� juosta"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Aplankas"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Eiti � aplank�..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Importuoti..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Perkelti..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Naujas"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Naujas aplankas"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Kalendoriaus nuostatos..."
+msgid "_Remove Other User's Folder"
+msgstr "Sukurti _nauj� aplank�..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Si�sti / Gauti"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Pa�to nuostatos..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Trumpi� juosta"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Trump�"
@@ -28876,11 +29065,11 @@ msgstr "Koduot�"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Paie�kos redaktorius"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "I�saugoti paie�k�"
 
@@ -28960,6 +29149,59 @@ msgstr "init_corba(): negal�jau inicializuoti GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr " _Pa�alinti"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Prid�ti"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Ie�koma nauj� lai�k�"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Aplankas n�ra tu��ias"
+
+#~ msgid "1 byte"
+#~ msgstr "1 baitas"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u bait�"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Tu pamir�ai pasirinkti aplank�.\n"
+#~ "Pra�au, gr��k atgal ir nurodyk tikr� aplank�, � kur� perkelti lai�kus."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s negalima perkonfig�ruoti, nes tai n�ra vietinis aplankas"
+
+#, fuzzy
+#~ msgid "Type the name by which you would like to refer to this signature."
+#~ msgstr ""
+#~ "Pasirink pavadinim�, kuriuo nor�tum vadinti �iuos serverius. Pavyzd�iui, "
+#~ "�Namai� ar �Darbas�."
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importuojama %s\n"
+#~ "Importeris nepasiruo��s.\n"
+#~ "Laukiu 5 sekundes kol bandysiu v�l."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolution importavimo pad�j�jas"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Kalendoriaus nuostatos..."
+
 #~ msgid "Error in search expression."
 #~ msgstr "Klaida paie�kos i�rai�koje."
 
@@ -29013,15 +29255,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "Ne dalyviai"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "�is lai�kas nebuvo i�si�stas.\n"
-#~ "\n"
-#~ "Ar nor�tum i�saugoti jo pakeitimus?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (�prasta)"
@@ -29263,14 +29496,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Select a signature script"
 #~ msgstr "I�trinti visk�, i�skyrus para��"
 
-#, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML para�as:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Bylos vardas:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML para�as:"
 
@@ -29306,14 +29531,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Riga"
 #~ msgstr "De�in�je:"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "Prid�ti"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr " _Pa�alinti"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Ar tu tikrai nori i�trinti aplank� '%s'?"
 
@@ -29817,9 +30034,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_U�duotis..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Pa�to nuostatos..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Persi�sti _prikabinus"
 
diff --git a/po/lv.po b/po/lv.po
index 0339c5b5cb..c078a1b138 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution for latvian\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-01-22 00:27+0200\n"
 "Last-Translator: Peteris Krisjanis <peteris.krisjanis@ttc.lv>\n"
 "Language-Team: Latvian <ll10nt@ttc.lv>\n"
@@ -319,11 +319,17 @@ msgstr "Uzvārds"
 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 "Nenosaukts Kontaktu Saraksts"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Vairākas VKartes"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VKarte"
@@ -334,47 +340,47 @@ msgstr "%s VKarte"
 #: 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 "Nevar inizializēt 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 "Meklējam..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Ielādējam..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Savienojamies ar LDAP serveri..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Pievienojam karti LDAP serverim..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Izņemam karti no LDAP servera..."
 
-#: 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 "Mainām karti no LDAP servera..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Saņemam LDAP meklēšanas rezultātus..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Kļūda izņemot vizītkarti"
@@ -393,13 +399,13 @@ msgid "EBook not loaded\n"
 msgstr "EGramata nav ielādēta\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 "Nevar sāknēt wombat serveri"
 
 #: 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 "Nevar sāknēt wombat"
@@ -466,10 +472,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Ražotne vienkāršai Adrešu grāmatas kontrolei"
 
 #: 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 "Kontakti"
@@ -486,29 +492,39 @@ msgstr "LDAP Serveris"
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kas satur informāciju par kontaktiem"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Mape, kas satur informāciju par kontaktiem"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Jauns Kontakts"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Kontaktēties"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Izveidot jaunu kontaktu"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Jauns Kontaktu Saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktu Saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Izveidot jaunu kontaktu sarakstu"
@@ -557,7 +573,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL nav vēl atbalstīts šajā evolution kompilējumā)"
 
 #: 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 "Nevar initicializēt gnome-vfs"
 
@@ -565,11 +581,11 @@ msgstr "Nevar initicializēt gnome-vfs"
 msgid "Other Contacts"
 msgstr "Citi Kontakti"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Nevar atvērt adrešu gramatu"
 
-#: 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 ""
 "Mēs nespējām atvērt šo adrešu grāmatu. Lūdzu pārbaudiet\n"
 "vai šis ceļš eksistē un vai jums ir atļauja atvērt to."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -588,7 +604,7 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
 "ir izslēgts"
 
-#: 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"
@@ -600,7 +616,7 @@ msgstr ""
 "jums ir jākompilē programma no CVS avota pēc OpenLDAP\n"
 "dabūšanas no saites lejup.\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"
@@ -611,38 +627,51 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
 "ir izslēgts"
 
-#: 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 ""
+"Neiespējami autentificēties ar IMAP serveri.\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 "Ievadiet %s paroli (lietotājs %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "beidzas ar"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "beidzas ar"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija ir"
 
 #. 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 "Jebkuršs lauks satur"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Paplašināts..."
 
-#: 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"
@@ -650,7 +679,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"
@@ -658,25 +687,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 "Jebkura Kategorija"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "URI ko Mapju Aplūks attēlos"
 
@@ -743,53 +772,53 @@ msgid "  S_how Supported Bases "
 msgstr "_Pārbaudīt atbalstītos paņēmienus"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Opcijas"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "_Izņemt"
-
-#: 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 "_Izņemt"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opcijas"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -926,48 +955,54 @@ msgstr "Viens"
 
 #: 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 "Meklēšanas apmēri: "
 
 #. 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 "Meklēšana"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Izvēlēties Visus"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Dzēsts"
 
-#: 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"
@@ -978,7 +1013,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"
@@ -987,47 +1022,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 "Avota Informācija:"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Savienojamies ar serveri..."
 
-#: 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 "Apakš"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Neatbalstīta shēma"
 
-#: 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"
@@ -1035,7 +1070,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"
@@ -1044,7 +1079,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"
@@ -1052,7 +1087,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"
@@ -1062,7 +1097,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"
@@ -1072,27 +1107,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 "
@@ -1102,7 +1137,7 @@ msgstr ""
 "Šis vārds tiks lietots lai identificētu jūsu kontu. Tas ir tikai rādīšanas "
 "dēļ."
 
-#: 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"
@@ -1110,11 +1145,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"
@@ -1123,25 +1158,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 "Šī ir pas_ta adrese"
 
-#: 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
@@ -1149,49 +1184,49 @@ msgstr ""
 msgid "_Add"
 msgstr "_Pievienot"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_Pievienot"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Pievienot darbību"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Pievienot darbību"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Brīdinājumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Dzēst visu"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Attēlot"
 
-#: 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
@@ -1201,102 +1236,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "R_ediģēt satikšanos"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution Brīdinājums"
 
-#: 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 "_Opcijas"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Ports:"
 
-#: 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 "Meklēšanas _bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Servera nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Snaust kādu laiku (minūtes)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Konts %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "konaktu-saraksta-redaktors"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Pārvienojamies ar %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 "Galvenais"
 
-#: 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 "Meklēšana"
@@ -1311,8 +1346,8 @@ msgstr "Ražotne Adrešu grāmatas vārda izvēles interfeisam"
 
 #. 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"
@@ -1343,11 +1378,11 @@ msgstr "(%d nav parādīts)"
 msgid "Unnamed Contact"
 msgstr "Nenosaukts Kontakts"
 
-#: 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 "Izvēlieties Kontaktus no Adrešu Grāmatas"
 
-#: 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 "Sūtītājs satur"
@@ -1421,7 +1456,7 @@ msgid "D_epartment:"
 msgstr "D_epartaments:"
 
 #: 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 "Detaļas"
 
@@ -1481,13 +1516,13 @@ msgstr "Grib saņemt _HTML pastu"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c: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 "_Dzēst"
 
@@ -1515,1029 +1550,1029 @@ msgstr "_Publiskā Kalendāra URL:"
 msgid "_Web page address:"
 msgstr "_Tīmekļa lapaspuses adrese:"
 
-#: 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 "Amerikas Savienotās Valstis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afganistāna"
 
-#: 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 "Albānija"
 
-#: 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 "Aldžīrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Amerikāņu Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "Andora"
 
-#: 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 "Anguila"
 
-#: 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 "Antikua un 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 "Argentīna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "Armēnija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "Aurba"
 
-#: 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 "Austrālija"
 
-#: 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 "Austrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbaidžāna"
 
-#: 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 "Bahrēna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladeša"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "Barbadosa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "Baltkrievija"
 
-#: 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ģija"
 
-#: 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 "Benina"
 
-#: 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 "Butāna"
 
-#: 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 "Bolīvija"
 
-#: 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 "Bosnija-Hercogovina"
 
-#: 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 "Bouveta Sala"
 
-#: 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 "Brazīlija"
 
-#: 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 "Britu Indijas Okeāna Teritorija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "Brunejas Karaliste"
 
-#: 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 "Būlgārija"
 
-#: 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 "Burundī"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "Kambodžija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Kamerūna"
 
-#: 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 "Kanāda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr "Kapoverde"
 
-#: 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 "Kaimanu Salas"
 
-#: 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 "Centrālāfrikas Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Čada"
 
-#: 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 "Čīle"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Ķīna"
 
-#: 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 "Ziemassvētku Sala"
 
-#: 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 "Kokosu (Kīlinga) Salas"
 
-#: 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 "Kolumbija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Komoros salas"
 
-#: 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 "Kuka Salas"
 
-#: 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 "Kostarika"
 
-#: 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 "Cote 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 "Horvātija"
 
-#: 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 "Kipra"
 
-#: 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 "Čehija"
 
-#: 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ānija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Džibutī"
 
-#: 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 "Dominikāņu Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Austrumtimora"
 
-#: 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 "Ekvadora"
 
-#: 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 "Ēģipte"
 
-#: 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 "Elsalvadora"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriālā Gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eriteja"
 
-#: 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 "Igaunija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Faiklandes Salas"
 
-#: 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 Salas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fidžī"
 
-#: 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 "Somija"
 
-#: 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 "Francija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Franču Gviāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Franču Polinēzija"
 
-#: 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 "Franču Dienvidu Teritorijas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabona"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambija"
 
-#: 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 "Armēnija"
 
-#: 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 "Vācija"
 
-#: 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 "Gibraltārs"
 
-#: 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 "Grieķija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grinlande"
 
-#: 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 "Gvadelupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guama"
 
-#: 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 "Gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Gvineja-bisau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Gajāna"
 
-#: 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 "Hērdas un Makdonalda Salas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "Vatikāns"
 
-#: 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 "Hondura"
 
-#: 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 "Honkonga"
 
-#: 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 "Ungārija"
 
-#: 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 "Indija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonēzija"
 
-#: 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 "Īrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Izarēla"
 
-#: 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 "Itālija"
 
-#: 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 "Japāna"
 
-#: 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 "Jordāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazahstāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Keinja"
 
-#: 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 "Korejas Republika"
 
-#: 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 "Kuvēta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kirgiztāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laosa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Latvija"
 
-#: 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 "Lebanona"
 
-#: 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 "Libērija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Lihenšteina"
 
-#: 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 "Lietuva"
 
-#: 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 "Luksemburga"
 
-#: 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 "Maķedonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madagaskāra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malavī"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malaizija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Maldivu salas"
 
-#: 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šala Salas"
 
-#: 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 "Mauritānija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Mauritānija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "Majota"
 
-#: 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 "Mikronēzija"
 
-#: 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 "Korejas Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "Monāko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "Mongolija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "Montserata"
 
-#: 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 "Moroko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mozambika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Mjanma"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Namībija"
 
-#: 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 "Nepāla"
 
-#: 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 "Nīderlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Nīderlandes Antilas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Jaunkaledonija"
 
-#: 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 "Jaunzē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 "Nikaragva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "Nigērija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigērija"
 
-#: 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 "Norfolkas salas"
 
-#: 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 "Ziemeļmarina"
 
-#: 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ēģija"
 
-#: 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āna"
 
-#: 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āna"
 
-#: 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 "Palestīniešu Teritorija"
 
-#: 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-Jaungvineja"
 
-#: 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 "Paragvaja"
 
-#: 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 "Filipīnas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "Pitkērna"
 
-#: 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 "Polija"
 
-#: 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 "Portugāle"
 
-#: 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 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 "Katara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "Reinjona"
 
-#: 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ānija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Krievijas Federācija"
 
-#: 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 "Santkikta un Nevisa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "Sentlūsija"
 
-#: 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 "Sanvincenta Un Grenadaina"
 
-#: 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 Marīno"
 
-#: 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 Un Principa"
 
-#: 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 Arābija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Senegāla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Seišelas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "Sjerra 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 "Singapūra"
 
-#: 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 "Slovākija"
 
-#: 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ēnija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Slomona Salas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somālija"
 
-#: 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 "Dienvidāfrika"
 
-#: 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 "Armēnija"
 
-#: 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 "Spānija"
 
-#: 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 "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 "Santpijerra Un Mikuelona"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Sudāna"
 
-#: 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 "Surinama"
 
-#: 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 "Svalbarda Un Jana Majena Salas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Šveice"
 
-#: 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 "Zviedrija"
 
-#: 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 "Šveice"
 
-#: 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 "Taivāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tadžikistāna"
 
-#: 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 "Tanzānijas Apvienotā Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Taizeme"
 
-#: 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 "Trinidada Un Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunisija"
 
-#: 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 "Turcija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Turkmenistāna"
 
-#: 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 "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 "Apvienotie Arābu Erimāti"
 
-#: 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 "Apvienotā Karaliste"
 
-#: 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 "Urugvaja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Uzbekistāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "Vanatu"
 
-#: 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 "Venēcija"
 
-#: 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 "Vjetnama"
 
-#: 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 "ASV Virdžinu Salas"
 
-#: 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 "ASV Virdžinu Salas"
 
-#: 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 "Rietumu Sahāra"
 
-#: 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 "Jemena"
 
-#: 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 "Dienvidslāvija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Zambija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "ZImbabve"
 
@@ -2574,20 +2609,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nevar atrast vidžetu laukā: `%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 "Kontakta Ātrā pievienošana"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Rediģēt Pilnīgi"
 
-#: 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 "Pilns Vārds"
 
-#: 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-pasts"
 
@@ -2609,6 +2644,19 @@ msgstr ""
 "%s jau eksistē\n"
 "Vai tu vēlies to pārrakstīt?"
 
+#: addressbook/gui/contact-editor/file-exists.glade.h:1
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: 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 "Pārrakstīt failu?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adrese _2:"
@@ -2739,7 +2787,7 @@ msgstr "konaktu-saraksta-redaktors"
 msgid "Contact List Editor"
 msgstr "Kontaktu Saraksta Redaktors"
 
-#: 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 "Saglabāt Sarakstu kā VKarti"
 
@@ -2789,7 +2837,7 @@ msgstr ""
 "eksistē šajā mapē. Vai jūs to vēlaties pievienot jebkurā gadījumā?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Paplašinātā Meklēšana"
 
@@ -2798,25 +2846,25 @@ msgstr "Paplašinātā Meklēšana"
 msgid "Search"
 msgstr "Meklēšana"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 vizītkarte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d vizītkartes"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Kļūda sāknējot %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"
@@ -2828,10 +2876,10 @@ msgid "Success"
 msgstr "Veiksmīgi"
 
 #: 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 "Nezināma kļūda"
 
@@ -2839,7 +2887,7 @@ msgstr "Nezināma kļūda"
 msgid "Repository offline"
 msgstr "Repozitorijs nesaistes režīmā"
 
-#: 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 "Atļauja liegta"
@@ -2860,8 +2908,8 @@ msgstr "Protokols nav atbalstīts"
 #: 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 "Atsaukts"
 
@@ -2912,7 +2960,7 @@ msgstr "Kļūda izņemot sarakstu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Kļūda izņemot vizītkarti"
 
@@ -2929,9 +2977,8 @@ msgstr "Attēlot"
 #: 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
@@ -3021,7 +3068,7 @@ msgstr "Adrešu grāmata"
 
 #: 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 "Saglabāt kā VKarti"
@@ -3107,7 +3154,7 @@ msgstr "Kopēt"
 msgid "Paste"
 msgstr "Ievietot"
 
-#: 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
@@ -3115,8 +3162,8 @@ msgstr "Ievietot"
 msgid "Delete"
 msgstr "Dzēst"
 
-#: 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 "_Pašreizējais Skats"
@@ -3125,7 +3172,7 @@ msgstr "_Pašreizējais Skats"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c: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"
 
@@ -3133,11 +3180,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"
@@ -3273,7 +3320,7 @@ msgid "Include:"
 msgstr "Iekļaut:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Ainavveida"
 
@@ -3298,7 +3345,7 @@ msgid "Options"
 msgstr "Opcijas"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientācija"
 
@@ -3321,7 +3368,7 @@ msgstr "Papīra avots:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portrets"
 
@@ -3383,20 +3430,20 @@ msgstr "Nenosaukta tikšanās"
 
 #: 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 "Augsts"
 
 #: 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 "Normāls"
 
 #: 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 "Zems"
 
@@ -3407,13 +3454,17 @@ msgstr "Zems"
 msgid "Undefined"
 msgstr "Nedefinēts"
 
-#: 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 "Kļūda savienojoties ar kalendāra serveri"
 
-#: 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 "Nevar nolasīt pilota Kalendāra aplikācijas bloku"
 
@@ -3525,11 +3576,11 @@ msgstr "Snaust kādu laiku (minūtes)"
 msgid "_Edit appointment"
 msgstr "R_ediģēt satikšanos"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Apraksts nav pieejams."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 #, fuzzy
 msgid ""
 "Evolution does not support calendar reminders with\n"
@@ -3542,13 +3593,13 @@ msgstr ""
 "\n"
 " normāls kaste."
 
-#: 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 "Brīdinājums"
 
-#: 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 "
@@ -3565,16 +3616,16 @@ msgstr ""
 "\n"
 "Vai jūs patiešām vēlaties laist šo programmu?"
 
-#: 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 "Neprasiet man vēlreiz."
 
-#: 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 "Nevar initializēt 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 ""
 
@@ -3623,7 +3674,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 ""
@@ -3700,9 +3751,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
@@ -3719,13 +3770,13 @@ msgid "Assigned"
 msgstr "Asignēts"
 
 #: 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 "Jā"
 
 #: 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 "Nē"
 
@@ -3745,82 +3796,102 @@ msgstr "Nedēļas Skats"
 msgid "Month View"
 msgstr "Mēneša Skats"
 
-#: 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 "Kalendārs"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Mape, kur atrodas informācija par satikšanām un notikumiem"
 
-#: 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 "_Publiskā Kalendāra URL:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Mape, kur atrodas informācija par satikšanām un notikumiem"
+
+#: 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 "Uzdevumi"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Uzdevumu mape"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Drukāt vizītkartes"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Uzdevumu mape"
+
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Jauna Tikšanās"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "Satikšanās"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Ievietot jaunu ierakstu par satikšanos"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Ziņas"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "Satikšanās"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Jauns Uzdevums"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Uzdevums"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Jauna Tikšanās"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Jauna _Satikšanās"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ievietot jaunu ierakstu par satikšanos"
@@ -3863,29 +3934,30 @@ msgid "Alarm Repeat"
 msgstr "Atkārtot Brīdinājumu"
 
 #: 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 ""
+"Šis ir epasta atgādinātajs, bet Evolution vēl neatbalsta šāda veida "
+"atgādinājumus. Jums nebūs iespējams rediģēt opcijas šim atgādinājumam."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Ziņa, ko Attēlot"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Spēlēt Skaņu:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Atkārtot brīdinājumu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Palaist programmu:"
 
-#: 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 ""
-"Šis ir epasta atgādinātajs, bet Evolution vēl neatbalsta šāda veida "
-"atgādinājumus. Jums nebūs iespējams rediģēt opcijas šim atgādinājumam."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Ar šiem argumentiem:"
@@ -3909,110 +3981,110 @@ msgstr "stundas"
 msgid "minutes"
 msgstr "minūtes"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d dienas"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 diena"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d nedēļas"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 nedēļa"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d stundas"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 stunda"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minūtes"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 minūte"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekundes"
 
-#: 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 "Spēlēt skaņu"
 
-#: 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 "Parādīt paziņojumu"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Sūtīt epastu"
 
-#: 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 "Sāknēt programmu"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Nezināma darbība, kas tiks izpildīta"
 
-#: calendar/gui/dialogs/alarm-page.c:403
+#: calendar/gui/dialogs/alarm-page.c:413
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pirms tikšanās sākuma"
 
-#: calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/dialogs/alarm-page.c:416
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s pēc tikšanās sākuma"
 
-#: calendar/gui/dialogs/alarm-page.c:411
+#: calendar/gui/dialogs/alarm-page.c:421
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s satikšanās sākumā"
 
-#: 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 pirms tikšanās beigām"
 
-#: 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ēc tikšanās beigām"
 
-#: 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 tikšanās beigās"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s iekš %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 ""
@@ -4033,7 +4105,7 @@ msgstr "Atgādinājumi"
 
 #: 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 "Kopsavilkums:"
 
@@ -4116,7 +4188,7 @@ msgid "Days"
 msgstr "Dienas"
 
 #: 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 "Piekdiena"
 
@@ -4129,7 +4201,7 @@ msgid "Minutes"
 msgstr "Minūtes"
 
 #: 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 "Pirmdiena"
 
@@ -4139,7 +4211,7 @@ msgid "S_un"
 msgstr "Sv"
 
 #: 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 "Sesdiena"
 
@@ -4152,7 +4224,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Parādīt nedēļas _numurus datuma navigātorā"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Svēdiena"
 
@@ -4171,7 +4243,7 @@ msgid "Task List"
 msgstr "_Uzdevumu Saraksts"
 
 #: 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 "Ceturdiena"
 
@@ -4188,7 +4260,7 @@ msgid "Time format:"
 msgstr "Laika formāts:"
 
 #: 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 "Otradiena"
 
@@ -4197,7 +4269,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 "Trešdiena"
 
@@ -4426,8 +4498,8 @@ msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
 #: 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 "Saglabāt kā..."
 
@@ -4497,27 +4569,27 @@ msgstr "Deleģēt Uz:"
 msgid "Enter Delegate"
 msgstr "Ievadīt Delegātu"
 
-#: 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 "Satikšanās"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Atgādinājums"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Atkārtošanās"
 
-#: 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ānošana"
 
-#: 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 "Satikšanās"
 
@@ -4586,19 +4658,19 @@ msgstr "B_eigu laiks:"
 msgid "_Start time:"
 msgstr "_Sākuma laiks:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Nepieciešams organizētajs"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Jābūt vismaz vienam dalībniekam."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Šī persona jau apmeklē satikšanos!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Deleģēt Uz..."
 
@@ -4638,7 +4710,7 @@ msgid "Member"
 msgstr "Loceklis"
 
 #: 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"
@@ -4650,7 +4722,7 @@ msgstr "Loma"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4726,48 +4798,48 @@ msgstr "."
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Šī tikšanās satur atkārtošanās ko Evolution nevar rediģēt."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "uz"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "saraksts"
 
-#: 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 "sekunde"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Citi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "Ziemeļu"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "saraksts"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Cits Fakss"
 
-#: 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 "dienā"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "uz"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "gadījumi"
 
@@ -4861,7 +4933,7 @@ msgstr "Izpildes Datums:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c: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 "Pieprasa Darbību"
 
@@ -4870,7 +4942,7 @@ msgid "Progress"
 msgstr "Progress"
 
 #: 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:"
 
@@ -4882,17 +4954,17 @@ msgstr "_Prioritāte:"
 msgid "_Status:"
 msgstr "_Statuss:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Pamata"
 
-#: 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 "Uzticējums"
 
-#: 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:"
@@ -4962,12 +5034,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 "Dzēšam "
 
-#: 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 "_Atvērt"
@@ -4977,30 +5049,30 @@ msgstr "_Atvērt"
 msgid "_Save as..."
 msgstr "Saglabāt kā..."
 
-#: 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 "_Drukāt..."
 
-#: 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 "_Izgriezt"
 
-#: 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 "_Kopēt"
 
-#: 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 +5101,12 @@ msgstr "A_tzīmēt Uzdevumus kā Izpildītus"
 msgid "_Delete Selected Tasks"
 msgstr "_Dzēst Izvēlētos Uzdevumus"
 
-#: 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 "Atjaunināt objektus"
 
-#: 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šķināt lai pievienotu uzdevumu"
@@ -5043,8 +5115,8 @@ msgstr "Klikšķināt lai pievienotu uzdevumu"
 msgid "Alarms"
 msgstr "Brīdinājumi"
 
-#: 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 "Izpildīts"
 
@@ -5073,7 +5145,7 @@ msgid "Start Date"
 msgstr "Sākuma Datums"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Kopsavilkums"
@@ -5140,122 +5212,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 "Jauna _Satikšanās"
 
-#: 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 "Jauns Visas Di_enas Notikums"
 
-#: 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 "Satikšanās"
 
-#: 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 "Jauns Uzdevums"
 
-#: 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 "Drukāt..."
 
-#: 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 "Ej Uz _Dienu"
 
-#: 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 "_Ej uz Datumu..."
 
-#: 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 "_Publicēt Brīvs/Aizņemts Informāciju"
 
-#: 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 "Konfigurācija"
 
-#: 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 "Konfigurācija"
 
-#: 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 "_Saglabāt Kā..."
 
-#: 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 "Plānot _Tikšanos"
 
-#: 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 "Pārsūtīt kā iKalendāru"
 
-#: 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 "Dzēst šo _Gadījumu"
 
-#: 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 "Dzēst Visus G_adījumus"
 
-#: 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 rīki nav uzstādīti šajā sistēmā."
 
-#: 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 "Kļūda sāknējot %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 "Beidzas: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Izpildīts"
 
-#: 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 informācija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "iCalendar Kļūda"
 
-#: 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 "Nezināma persona"
 
 #. 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."
@@ -5263,330 +5335,336 @@ msgstr ""
 "<br> Lūdzu apskatiet sekojošo informāciju un pēc tam izvēlieties darbību no "
 "izvēlnes zemāk."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Nekas</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "L_okācija: "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_Statuss:"
 
-#: 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 "Apstiprināts"
 
-#: 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 "Paigaidām akceptēt"
 
-#: 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 "Noliegts"
 
-#: 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 "Nezināms"
 
-#: 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 "Izvēlieties darbību:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Atjaunot"
 
-#: 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 "Apstiprināt"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Paigaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Noliegt"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Nosūtīt Brīvs/Aizņemts Informāciju"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Atjaunināt respondenta statusu"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Sūtīt Pēdīgo Informāciju"
 
-#: 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 "Atsaukt"
 
-#: 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> ir publicējis informāciju par tikšanos."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Informācija par Satikšanos"
 
-#: 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> pieprasa tavu klātbūtni tikšanās."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Satikšanās Iemesls"
 
-#: 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> vēlas pievienot jau eksistējošai tikšanās."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Atjaunināta Informācija Par Satikšanos"
 
-#: 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> vēlas saņemt pēdīgo informāciju par tikšanos."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Informācijas Par Satikšanos Atjaunināšanas Pieprasīšana"
 
-#: 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> ir atbildējis uz tikšanās pieprasījumu."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Atbilde Par Satikšanos"
 
-#: 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> ir atsaucis tikšanos."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Satikšanās Atcelšana"
 
-#: 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> ir atsaucis tikšanos."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Slikta Satikšanās Ziņa"
 
-#: 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> ir publicējis informāciju par uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Uzdevuma Informācija"
 
-#: 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> pieprasa jums izpildīt uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Uzdevuma Priešlikums"
 
-#: 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> vēlas pievienot jau eksistējošam uzdevumam."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Uzdevuma Atjaunināšana"
 
-#: 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> vēlas saņemt pēdīgo informāciju par uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Uzdevuma Atjaunināšanas Pieprasījums"
 
-#: 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> ir atbildējis uz uzdevuma nozīmēšanu."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Uzdevuma Atbilde"
 
-#: 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> ir atcēlis uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Uzdevuma Atsaukums"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Slikts Uzdevuma Ziņojums"
 
-#: 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> ir publicējis brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Brīvs/Aizņemts Informācija"
 
-#: 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> pieprasa tavu brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Brīvs/Aizņemts Pieprasījums"
 
-#: 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> ir atbildējis uz brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Brīvs/Aizņemts Atbilde"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Slikta Brīvs/Aizņemts Ziņa"
 
-#: 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 "Šī mape izskatās ir neatgriezeniski sabojāta."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
 
-#: 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 "Pievienojums nesatur atļautu kalendāra ziņu"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "Pievienojumam nav skatāmu kalendāra priekšmetu"
 
-#: 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 "Priekšmets nevar tikt nosūtīts!\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 "Nevar atvērt mapi uz `%s'"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendāra fails nevar tikt atjaunināts!\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 ""
 "Apmeklētāja status nevar tikt atjaunināts tāpēc ka priekšmets vairāk "
 "neeksistē"
 
-#: 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 ""
 "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\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 "Nevar atvērt mapi uz `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Izņemšana Pabeigta"
 
-#: 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 "Priekšmets nosūtīts!\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 "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Izvēlēties Mapi"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Izvēlēties Mapi"
@@ -5632,7 +5710,7 @@ msgstr "datums-beigas"
 msgid "Chair Persons"
 msgstr "Vadošās Personas"
 
-#: 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 "Pieprasītie Dalībnieki"
 
@@ -5646,52 +5724,52 @@ msgid "Resources"
 msgstr "Resurss"
 
 #: 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 "Individuāli"
 
 #: 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 "Grupa"
 
 #: 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 "Resurss"
 
 #: 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 "Istaba"
 
 #: 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 "Krēsls"
 
 #: 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 "Pieprasītais Dalībnieks"
 
 #: 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 "Iespējamais Dalībnieks"
 
 #: 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 "Nepiedalās"
 
 #: 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 "Pagaidu"
 
 #: 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 "Deleģēts"
 
@@ -5781,43 +5859,50 @@ msgstr "Satikšanās _sākuma laiks:"
 msgid "Meeting _end time:"
 msgstr "Satikšanās _beigu laiks:"
 
-#: 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 "Atvērt uzdevumus uz %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 "Nevar ielādēt uzdevumus uz `%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 "Metode lai ielādētu `%s' nav atbalstīta"
 
-#: 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 "Nevar atvērt mapi uz `%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 "Kļūda sāknējot %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Izpildes Datums"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Dzēšam "
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "Dzēšam mapi"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Jauna _Tikšanās...."
 
@@ -5831,7 +5916,13 @@ msgstr "Nevar atvērt mapi uz `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Pieprasītā metode, lai atvērtu `%s' nav atbalstīta"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Brīdinājums %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5839,7 +5930,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"
@@ -5847,12 +5938,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 "Atvērt kalendāru uz %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Atveram mapi %s"
@@ -5913,49 +6004,58 @@ msgstr "Oktobris"
 msgid "September"
 msgstr "Septembris"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Vismaz viens apmeklētajs ir vajadzīgs"
-
-#: 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 "Jābūt norādītam organizētājam."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Vismaz viens apmeklētajs ir vajadzīgs"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Notikuma informācija"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Uzdevuma Informācija"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Žurnāla informācija"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Brīvs/Aizņemts informācija"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Kalendāra informācija"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Atjaunot"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Atsvaidzināt Sarakstu"
 
-#: 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 "Brīvs/Aizņemts informācija (%s uz %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "iCalendar informācija"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Jums jābūt notikuma apmeklētājam."
 
@@ -6192,7 +6292,7 @@ msgid "Print Calendar"
 msgstr "Drukāt Kalendāru"
 
 #: 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 "Drukāšanas Pirmsapskats"
@@ -6216,7 +6316,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: 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 "
@@ -6228,12 +6328,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 "Neprasiet man vēlreiz."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Drukāt vizītkartes"
@@ -6299,17 +6399,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Nevar savienoties ar glabātuvi: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Atgādinājums"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendāra Ziņojums"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6318,131 +6418,136 @@ msgstr ""
 "Evolution ir atradis Pine pasta failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalendārs"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now pieprasa 0 argumentus"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time pieprasa 1 argumentu"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time pieprasa argumentu nr.1 kā virkni"
 
-#: 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 argumentam nr. 1 jābūt ISO 8601 datuma/laika virknei"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 #, fuzzy
 msgid "time-add-day expects 2 arguments"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 #, fuzzy
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 #, fuzzy
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 #, fuzzy
 msgid "time-day-begin expects 1 argument"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 #, fuzzy
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 #, fuzzy
 msgid "time-day-end expects 1 argument"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 #, fuzzy
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 #, fuzzy
 msgid "get-vtype expects 0 arguments"
 msgstr "dabūt"
 
-#: 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
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "satur"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 #, fuzzy
 msgid "contains? expects argument 1 to be a string"
 msgstr "satur"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 #, fuzzy
 msgid "contains? expects argument 2 to be a string"
 msgstr "satur"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 #, fuzzy
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr "satur apraksts"
 
-#: 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
 #, fuzzy
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr "visi"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 #, fuzzy
 msgid "is-completed? expects 0 arguments"
 msgstr "ir"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "pirms"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "pirms"
 
-#: 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 "Cita kļūda"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8066,82 +8171,82 @@ msgstr "Glabājam mapi '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Jums ir jāstrādā tiešsaistē lai izpildītu šo operāciju"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Sinhronizējam mapes"
 
-#: 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 "Kļūda parsējot filtru: %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 "Kļūda palaižot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Nespēj atvērt spool mapi"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Nespēj procesēt spool mapi"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dabūjam vēstuli %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Nevar atvērt vēstuli"
 
-#: 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 "Problēma ar vēstuli %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 "SInhronizējam mapi"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Kļūda pie vēstules %d no %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Neizdevās atkodēt vēstuli"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Nepareizi argrumenti"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Nepareizi argrumenti"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Neizdevās keišot vēstuli %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 "Neizdevās keišot vēstuli %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 "Kļūda sāknējot filtra meklēšanu: %s: %s"
@@ -8187,11 +8292,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 "Pārvietojam vēstules"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Kopējam vēstules uz %s"
@@ -8513,7 +8618,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 "Slikta autentifikācijas atbilde no servera."
 
@@ -8570,51 +8675,51 @@ msgstr "POP pirms SMTP autentifikācijas lietojot ne-pop avotu"
 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 "URL '%s' nepieciešams lietotājvārda komponents"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' nepieciešams resursdatora komponents"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' nepieciešams ceļa komponents"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sameklējam: %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 "Nevar atrast nosaukumu: %s"
 
-#: 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 "Sameklējam: %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 ""
 
@@ -8814,7 +8919,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"
@@ -8823,11 +8928,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 ""
 
@@ -8844,7 +8949,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"
@@ -8894,68 +8999,76 @@ msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
 
-#: camel/providers/imap/camel-imap-command.c: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 "Operācija atsaukta"
 
-#: 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 "Serveris negaidīti atvienojās: %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 "Negaidīta atbilde no IMAP servera: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Negaidīta atbilde no IMAP servera: %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 komandas kļūda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Servera atbilde beidzās pārāk ātri."
 
-#: 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 servera atbilde nesaturēja %s informāciju"
 
-#: 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 "Negaidīta OK atbilde no IMAP servera: %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 "Nevar izveidot direktoriju %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 "Nevar ielādēt %s kopsavilkumu"
 
-#: 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 "Mape tika iznīcināta un pārizveidota uz servera."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Meklējam izmainītās vēstules"
 
-#: 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 "Neizdevās atkodēt vēstuli"
 
-#: 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
@@ -8971,28 +9084,24 @@ msgstr ""
 "Nevar dabūt vēstuli: %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 "Nav tādas vēstules"
 
-#: 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 "Šī vēstule šobrīd nav pieejama"
 
-#: 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 "Meklējam jaunās vēstules"
-
-#: 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 ""
 
@@ -9009,6 +9118,11 @@ msgstr "Nevarēja atvērt keišdirektoriju: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Neizdevās keišot vēstuli %s: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Neizdevās keišot vēstuli %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Pārbaudam jauno pastu"
@@ -9055,77 +9169,72 @@ msgstr "Parole"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Šī opcija savienos ar IMAP serveri lietojot parastu teksta paroli."
 
-#: 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 serveris %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 serviss priekš %s uz %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 "Konekcija pārtraukta"
 
-#: 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 "Nevarēja savienoties ar %s (ports %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 ""
 "Nevar savienoties ar POP serveri.\n"
 "Kļūda sūtot lietotajvārdu: %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 "Operācija nav atbalstīta"
 
-#: 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 "Autentifikācija izjukusi."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Mape nav tukš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 "IMAP serveris %s neatbalsta pieprasīto autentifikācijas tipu %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 "Neatbalstīts autentifikācijas tips %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 "%sLūdzu ievadi IMAP paroli %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 "Jūs neievadījāt paroli."
 
-#: 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"
@@ -9136,24 +9245,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 "Nav tādas mapes %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 "Mapes nosaukums nedrīkst saturēt Return simbolu."
 
-#: 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 "Nezināma kļūda: %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 "Vecāku mapei nav atļauts saturēt apakšmapes"
 
@@ -9231,8 +9340,8 @@ msgid ""
 msgstr "failus."
 
 #: 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 "Glabātuves sakne %s nav absolūtais ceļš"
@@ -9244,7 +9353,7 @@ msgstr "Glabātuves sakne %s nav regulāra direktorija"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nevar dabūt mapi: %s: %s"
@@ -9258,32 +9367,32 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "Lokālā pasta fails %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 ""
 
-#: 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 "Nevar ielādēt %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 "Nevarēja izdzēst mapes kopsavilkuma failu `%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 "Nevarēja izdzēst mapes indeksa failu `%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 ""
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 #, fuzzy
 msgid "Unable to add message to summary: unknown reason"
 msgstr "nezināms"
@@ -9304,6 +9413,7 @@ msgstr "Nepareizs vēstules saturs"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9315,12 +9425,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 "Mape '%s' neeksistē."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9346,7 +9458,8 @@ msgid "not a maildir directory"
 msgstr "nav maildir direktorija"
 
 #: 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 "Nevarēja skanēt mapi `%s': %s"
@@ -9376,7 +9489,7 @@ msgid "Storing folder"
 msgstr "Glabājam mapi"
 
 #: 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 ""
@@ -9546,40 +9659,45 @@ msgstr "`%s' nav direktorija."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nevar atvērt MH direktorijas ceļu: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c: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 "Glabātuves sakne %s nav regulāra direktorija"
 
-#: 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 "Mape `%s/%s' neekistē."
 
-#: 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' nav pareizs fails."
+
+#: 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 "Glabājam mapi '%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 ""
 
@@ -9671,50 +9789,50 @@ msgstr "Atsaukt"
 msgid "Operation failed: %s"
 msgstr "Operācija atsaukta"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Saņemam POP kopsavilkumu"
 
-#: 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 "Operācija atsaukta"
 
-#: 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 "Nevar dabūt mapi: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Iznīcināt dzēstās vēstules"
 
-#: 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 "Nav vēstules ar uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Saņemam POP vēstuli %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 ""
 "Nevar dabūt vēstuli: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Nezināmi nokrišņi"
@@ -9990,45 +10108,45 @@ msgstr "Pagaidu autentifikācijas problēma"
 msgid "Authentication required"
 msgstr "Pieprasīta autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET atbildes kļūda: %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 ""
 "Nevar savienoties ar POP serveri.\n"
 "Kļūda sūtot lietotajvārdu: %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 "Ziņa varētu būt pareizi noformēta"
 
-#: 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 pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET atbildes kļūda: %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 serveris %s neatbalsta pieprasīto autentifikācijas tipu %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 "%sLūdzu ievadiet %s@%s SMTP paroli"
 
-#: 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"
@@ -10039,92 +10157,92 @@ 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 serveris %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 pasta nosūtīšana caur  %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 "Nevar nosūtīt adresi: sūtītāja adrese nav pareiza."
 
-#: 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ūtam vēstuli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 #, fuzzy
 msgid "Cannot send message: no recipients defined."
 msgstr "nē."
 
-#: 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 "nē."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP Apsveikums"
 
-#: 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 pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET atbildes kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 #, fuzzy
 msgid "Error creating SASL authentication object."
 msgstr "Kļūda."
 
-#: 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 pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH neveiksmīgs pieprasījums."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Slikta autentifikācijas atbilde no servera.\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 pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: 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 atbildes kļūda: %s: pasts nav nosūtīts"
 
-#: 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 pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: 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 pieprasījums iztecējis: %s: pasts nav nosūtīts"
@@ -10132,80 +10250,71 @@ msgstr "DATA pieprasījums iztecējis: %s: pasts nav nosūtīts"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET atbildes kļūda: %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ūtijums iztecējis: vēstules pārtraukšana: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Slikta autentifikācijas atbilde no servera."
 
-#: 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 pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET atbildes kļūda: %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 pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET atbildes kļūda: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 baits"
-
-#: 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 "pievienojums"
 
-#: 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 "Izņemt izvēlētos priekšmetus no pievienojumu saraksta"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Pievienot pievienojumu..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Pievienot failu vēstulei"
 
@@ -10237,7 +10346,7 @@ msgstr "MIME tips:"
 msgid "Suggest automatic display of attachment"
 msgstr "Ieteikt automātisku pievienojuma attēlošanu"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Uz adrešu grāmatu"
 
@@ -10248,45 +10357,45 @@ msgstr "Uz adrešu grāmatu"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Atbildēt Kam:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "No:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Subjekts:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Ievadiet vēstules saņēmējus"
 
-#: 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 "Ievadiet adreses kuras saņems vēstules kopiju"
 
-#: 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
 #, fuzzy
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
@@ -10296,12 +10405,12 @@ msgstr "saraksts."
 #.
 #. * 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 "Nav apraksta"
@@ -10316,7 +10425,7 @@ msgstr "Pievienot failu"
 msgid "Could not create a PGP signature context"
 msgstr "Nevarēja izveidot PGP paraksta kontekstu."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10325,34 +10434,34 @@ msgstr ""
 "Kļūda kāmēr lasot failu %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Brīdinājums!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Fails eksistē, pārrakstīt?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Kļūda saglabājot failu: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Kļūda ielādējot failu: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Kļūda atverot failu: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10361,7 +10470,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10370,7 +10479,7 @@ msgstr ""
 "Nevar samazināt failu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10379,7 +10488,7 @@ msgstr ""
 "Kļūda automātiski glabājot vēstuli: %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?"
@@ -10387,34 +10496,56 @@ msgstr ""
 "Ximian Evolution ir atradis nesaglabātus failus no iepriekšējās sesijas.\n"
 "Vai jūs gribētu tos atjaunot?"
 
-#: composer/e-msg-composer.c: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 ""
+"Šī vēstule netika nosūtīta.\n"
+"\n"
+"Vai tu vēlies saglabāt izmaiņas?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Brīdinājums: Mainīta Vēstule"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Atvērt failu"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Saglabāt parakstu"
 
-#: 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 "Uzrakstīt vēstuli"
 
-#: 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 ""
+"\n"
+" HTML komponents."
+
+#: composer/e-msg-composer.c:2879
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10423,13 +10554,13 @@ msgstr ""
 "\n"
 " HTML komponents."
 
-#: 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
 #, fuzzy
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -10438,8 +10569,9 @@ msgstr ""
 "\n"
 " komponents."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Nevar initializēt Evolution komponistu."
 
 #: data/evolution.desktop.in.h:1
@@ -10490,8 +10622,8 @@ msgstr "Subjekts satur"
 msgid "Subject does not contain"
 msgstr "Subjekts nesatur"
 
-#: 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?"
@@ -10640,7 +10772,8 @@ msgid "years"
 msgstr "gadi"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Jūs esat aizmirsis izvēlēties datumu."
 
 #: filter/filter-datespec.c:269
@@ -10696,15 +10829,12 @@ msgid "Add action"
 msgstr "Pievienot darbību"
 
 #: 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 ""
-"Jūs aizmirsāt izvēlēties mapi.\n"
-"Dodaties atpakaļ un izvēlieties pareizu mapi uz kurieni nosūtīt pastu."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Stila nosaukums:"
 
-#: 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 "Izvēlēties Mapi"
 
@@ -10717,7 +10847,7 @@ msgstr ""
 "Kļūda neregulārajā izteiksmē '%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 "Svarīgs"
@@ -10906,228 +11036,232 @@ msgid "Beep"
 msgstr "Belema"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "satur"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopēt uz Mapi"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Saņemšanas datums"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Nosūtīšanas Datums"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Dzēsts"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "nesatur"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nebeidzas ar"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "neeksistē"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "neeksistē"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "neskan kā"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "nesākas ar"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Neeksistē"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Melnraksts"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "beidzas ar"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Eksistē"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "eksistē"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Izteiksme"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "ir"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "bija pēc"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "bija pirms"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "Karogots"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "ir lielāks par"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "ir mazāks par"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nav"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Karogots"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 #, fuzzy
 msgid "Label"
 msgstr "_Lielāks"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Adresātu saraksts"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Ziņojuma Rumpis"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Ziņojuma Iesākums"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Pārvietot uz Mapi"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Sūtīt Vēstuli Kontaktam"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spēlēt Skaņu:"
 
-#: 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 "Lasīt"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Saņēmēji"
 
-#: 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 "Atbildēts uz"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Kopne"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "ir lielāks par"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "ir mazāks par"
+#: 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 "Rezultāts"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Sūtītajs"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Uzstādīt Statusu"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Kompānija"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Izmērs (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "skan kā"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Avota Konts"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifisks iesākums"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "sākas ar"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Apturēt Procesēšanu"
 
-#: 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 "Subjekts"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Uzstādīt Statusu"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "satur"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "nesatur"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "nebeidzas ar"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "neeksistē"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "neeksistē"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "neskan kā"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "nesākas ar"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "beidzas ar"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "eksistē"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "Karogots"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "bija pēc"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "bija pirms"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "ir lielāks par"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "ir mazāks par"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Karogots"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "nav"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "ir"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "ir lielāks par"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "ir mazāks par"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Kopne"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "skan kā"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "sākas ar"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Noteikumi"
@@ -11161,31 +11295,31 @@ msgstr "Jums jānorāda vismaz viena mape kā avots."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importē jūsu veco Eim pastu"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importējam..."
 
-#: 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 "Lūdzu uzgaidiet"
 
-#: 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 "Importējam %s kā %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 "Skanējam %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 "Pasts"
 
@@ -11246,39 +11380,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 importē jūsu vecos Netscape datus"
 
 #. 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 "Atkritumkaste"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokālā pasta fails %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 "Skanējam direktoriju"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Sākam importu"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Uzstādījumi"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Rediģēt Filtrus"
 
-#: 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?"
@@ -11397,26 +11531,36 @@ msgid "Folder containing mail"
 msgstr "Mape, kura satur pastu"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Publisks"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Mape, kura satur pastu"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Virtuālā Atkritumkaste"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Virtuālās Atkritumkastes mape"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Šī mape nevar saturēt ziņojumus."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Rekvizīti..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Izmainīt šīs mapes rekvizītus"
 
-#: 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."
@@ -11424,79 +11568,80 @@ msgstr ""
 "Kādi no pasta uzstādījumiem ir nepareizi, lūdzu pārbaudiet vai viss ir "
 "kārtībā."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 #, fuzzy
 msgid "You have not set a mail transport method"
 msgstr "uzstādīt"
 
-#: 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 "Brīdinājums: Mainīta Vēstule"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Jauna Pasta Ziņojums"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Pasta Vēstule"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Uzrakstīt vēstuli"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Jauna Vēstule"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Iepriekšējā Vēstule"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Jauna Pasta Ziņojums"
 
-#: 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 "Nevar initializēt Evolution pasta komponenti."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nevar initializēt Evolution pasta konfigurācijas komponentu."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nevar initializēt Evolution mapes informatīvo komponentu."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Savienojamies ar serveri..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Nevar reģistrēt glabātuvi ar čaulu"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr " \"%s\" Rekvizīti"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Rekvizīti"
 
-#: 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 "Nevar izveidot pagaidu direktoriju: %s"
@@ -11541,140 +11686,140 @@ msgstr "%d nosūtīti"
 msgid "%d total"
 msgstr "%d kopā"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Izveidot _Virtuālu Mapi No Vēstules"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "VMape ar Subjektu"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "VMape ar Sūtītāju"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r Saņēmējiem"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar Adresātu sarakstu"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz Subjektu"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz Sūtītāju"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz Saņēmējiem"
 
-#: 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 "Filtrs uz Adresātu Sarakstu"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā Jaunu Ziņojumu..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: 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 "_Atbildēt Sūtītājam"
 
-#: 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 "Atbildēt uz _Sarakstu"
 
-#: 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 "Atbildēt _Visiem"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: 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 "Pabeigts"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Tīrs"
 
 #. 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 "A_tzīmēt kā Lasītu"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _Neizlasītu"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _Svarīgu"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Atzīmēt _kā Nesvarīgu"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Atdzēst"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Pārvietot uz _Mapi..."
 
-#: 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 "_Kopēt uz Mapi..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Pievienot Sūtītāju Adrešu Grāmatai"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Attiecināt Filtrus"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Izveidot Noteikumu No Vēstules"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VMape Pasta Sarakstei"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrs Pasta Sarakstei (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMape Pasta Sarakstam (%s)"
@@ -11750,20 +11895,20 @@ msgstr "visi."
 msgid "Evolution Account Editor"
 msgstr "Evolution Kontu Redaktors"
 
-#: 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 "_Resursdators:"
 
-#: 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 "_Lietotājvārds:"
 
-#: 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 "_Ceļš:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 #, fuzzy
 msgid "You may not create two accounts with the same name."
 msgstr "ar."
@@ -11781,14 +11926,14 @@ msgid "Really delete account?"
 msgstr "Tiešām dzēst kontu?"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c: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 "Izslēgt"
 
 #: 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 "Aktivizēt"
 
@@ -11878,8 +12023,8 @@ msgstr ""
 #: 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"
 
 #: mail/mail-callbacks.c:270
@@ -11919,7 +12064,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Jums jānorāda saņēmēji, lai nosūtītu šo vēstuli."
 
-#: 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?"
@@ -11927,28 +12072,28 @@ msgstr ""
 "Nevar atvērt melnraksta mapi šim kontam.\n"
 "Vai jūs vēlaties lietot noklusēto melnrakstu mapi?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "nezināms nosūtītājs"
 
-#: 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, %%s rakstīja:"
 
-#: 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 "Pārvietot vēstule(s) uz"
 
-#: 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 "Kopēt vēstule(s) uz"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties rediģēt visas %d vēstules?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
@@ -11957,7 +12102,7 @@ msgstr ""
 "\n"
 " Melnraksti."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11965,39 +12110,39 @@ msgstr ""
 "Jūs varat pārsūtīt vēlreiz tikai\n"
 "tās vēstules, kas Nosūtīts mapē."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Vai jūs vēlaties pārsūtīt vēlreiz visas %d vēstules?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Nav Izvēlēta Vēstule"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Pārrakstīt failu?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Saglabāt Vēstuli Kā..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Saglabāt Vēstules Kā..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Parādīt nākošo neizlasīto vēstuli"
 
-#: 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
 #, fuzzy
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
@@ -12009,7 +12154,7 @@ msgstr ""
 "\n"
 "?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12018,66 +12163,66 @@ msgstr ""
 "Kļūda ielādējot filtra informāciju:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Drukāt Vēstuli"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "US-Vēstule"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Vēstules drukāšana neizdevās"
 
-#: 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 ""
 "Vai jūs esat pārliecināts, ka vēlaties atvērt visas %d vēstules atsevišķos "
 "logos?"
 
-#: 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 "Nav apraksta"
 
-#: 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 "Nenosaukts Kontakts"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Nosūtīts"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Pievienot kritēriju"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Saglabāt parakstu"
@@ -12134,16 +12279,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution Kontu Asistents"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konts"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Pārbaudam Servisu"
 
-#: 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 "Savienojamies ar serveri..."
 
@@ -12860,78 +13005,74 @@ msgstr "Nevarēja izveidot S/MIME aploksnes kontekstu."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nevarēja izveidot S/MIME atkodēšanas kontekstu."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Saglabāt Pievienojumu"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nevar izveidot pagaidu direktoriju: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Saglabāt Pievienojumu"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Skatīt Iekšēji"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Skatīt Iekšēji (via %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Slēpt"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Ārējais Skatītājs"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "_Ielādēt Attēlus"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Ielādējam vēstules saturu"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "N_okavētie uzdevumi:"
 
-#: 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 "Kopēt Saiti Pārlūkprogrammā"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopēt Saites Lokāciju"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Saglabāt Saiti kā (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Saglabāt attēlu kā..."
 
@@ -12940,138 +13081,134 @@ msgstr "Saglabāt attēlu kā..."
 msgid "Pinging %s"
 msgstr "Skanējam %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s pievienojums"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nevar noparsēt MIME vēstuli. Attēlojam kā avotu."
 
-#: 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 "Datums"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Nepareiza Adrese"
 
-#: 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 "No"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Atbildēt-Uz"
 
-#: 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 "Kam"
 
-#: 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"
 "Pastnieks: "
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Šī vēstule ir digitāli parakstīta. Klikšķiniet uz slēdzenes ikonu, lai "
 "uzzinātu vairāk."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nevarēja izveidot PGP pārbaudes kontekstu."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Šī vēstule ir digitāli parakstīta un ir autentiska."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Šī vēstule ir digitāli parakstīta bet nevar tikt pārbaudīta, vai ir "
 "autnetiska."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Norāde uz FTP saiti (%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 "Norāde uz lokālu failu (%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 "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
 
-#: 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 "Lokālās Mapes"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Pārkonfigurēt mapi"
 
-#: 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 "%s varētu netikt pārkonfigurēta, jo tā nav vietējā mape"
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 #, fuzzy
 msgid ""
 "If you can no longer open this mailbox, then\n"
@@ -13080,15 +13217,15 @@ msgstr ""
 "Ja nē\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 "Pārkonfigurēt /%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 ""
@@ -13329,21 +13466,21 @@ msgstr "Gaidām..."
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Atceries šo paroli"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Atceries šo paroli uz atlikušo sesiju"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s Paroli"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Ievadiet Paroli"
 
@@ -13352,11 +13489,11 @@ msgstr "Ievadiet Paroli"
 msgid "Could not save signature file: %s"
 msgstr "Nevarēju noglabāt paraksta failu."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Saglabāt parakstu"
 
-#: 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"
@@ -13366,11 +13503,12 @@ msgstr ""
 "\n"
 "Vai saglabāt jūsu izmaiņas?"
 
-#: 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 Paraksts:"
 
-#: 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 "Nosaukums:"
 
@@ -13406,7 +13544,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 "VMapes"
 
@@ -13436,67 +13574,67 @@ msgstr "(Nav subjekta)"
 msgid "%s - Message"
 msgstr "%s - Vēstule"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Redzēta"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Vairākas Neredzētas Ziņas"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Vairākas Ziņas"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Zemākais"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Zemāk"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Augstāk"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Augstākais"
 
-#: 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 "Šodien %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Vakardiena %I:%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 "Izveidojam vēstuļu sarakstu"
 
@@ -13571,45 +13709,71 @@ msgstr "Atbildēt Visiem"
 msgid "Review"
 msgstr "Pirmsapskats"
 
-#: 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 "Pabeigts"
+
+#: 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īrs"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Līdz"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Faila nosaukums:"
+
+#: 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 "Parakstīties uz mapi \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atrakstīties no mapes \"%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 "Mape"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Saglabāt mapē..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Nav izvēlēts serveris"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Lūdzu izvēlieties serveri."
 
@@ -24405,12 +24569,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Nav apraksta"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Pasta kopsavilkums"
 
-#: 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 "Lokālās Mapes"
 
@@ -24420,24 +24584,24 @@ msgstr "Lokālās Mapes"
 #. (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 Dienas Vārds"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Dienas Citāti"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Pievienot"
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 #, fuzzy
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "URL"
@@ -24478,11 +24642,11 @@ msgstr "(Nav Apraksta)"
 msgid "My Weather"
 msgstr "Mani Laikapstākļi"
 
-#: 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 "Laikapstākļi"
 
@@ -25815,6 +25979,11 @@ msgstr ""
 "Nevar pārsūtīt mapi:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Atvērt ar %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -26058,12 +26227,25 @@ msgid "Rename folder"
 msgstr "Pārdēvēt mapi"
 
 #: 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 "Norādītais mapes nosaukums nav pareizs: %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 ""
+"Nevar pārsaukt mapi:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -26072,12 +26254,12 @@ msgstr ""
 "Nevar izveidot norādīto mapi:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Izveidot _Jaunu Mapi..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Jauns..."
 
@@ -26107,20 +26289,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Lūdzu izvēlieties informāciju, ko jūs vēlētos importēt:"
 
-#. 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 ""
-"Importējam %s\n"
-"Importētājs nav gatavs.\n"
-"Gaidām 5 minutes, lai mēģinātu velreiz."
-
-#: 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"
@@ -26129,22 +26298,22 @@ msgstr ""
 "Improtējam %s\n"
 "Importējām priekšmetu %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Izvēlēties Mapi"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fails %s neeksistē"
 
-#: 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 Kļūda "
 
-#: 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"
@@ -26153,11 +26322,11 @@ msgstr ""
 "Nav importētāja kurš spētu tikt galā ar\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importējam"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26166,17 +26335,17 @@ msgstr ""
 "Importējam %s.\n"
 "Sākam %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Kļūda sāknējot %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Kļūda ielādējot %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26185,31 +26354,31 @@ msgstr ""
 "Importējam %s\n"
 "Importējam priekšmetu 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automātisks"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Faila nosaukums:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Faila tips:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Importēt datus un uzstādijumus no vecākām programmām"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importēt vienu failu"
 
-#: 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"
@@ -26217,24 +26386,24 @@ msgstr ""
 "Lūdzu uzgaidiet...\n"
 "Skannējam jau eksistējošajiem uzstādijumiem"
 
-#: 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 "Startējam Inteliģentos Importētājus"
 
-#: 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 "No %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Izvēlieties gala mērķa direktoriju lai importētu šos datus"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importēt"
 
@@ -26262,32 +26431,32 @@ msgstr "SInhronizējam mapi"
 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 "Atveram mapi %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 "Atveram mapi %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 "Atvērt ar %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 "Nevar atvērt mapi uz `%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 ""
@@ -26329,44 +26498,44 @@ msgstr "Mapes nosaukums nevar saturēt slīpzīmes."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' un '..' ir rezervēti mapju nosaukumi."
 
-#: 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 netika atrasts jūsu $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 nevar tikt palaists"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Par Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Ej uz mapi..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Izvēlies mapi kuru tu vēlies atvērt"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Izveidot jaunu saīsinājumu"
 
-#: 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 "Izvēlieties mapi uz kuru jūs gribat saīsinājumu:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "_Strādāt Tiešsaistē"
 
-#: 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 "_Strādāt Nesaistē"
 
-#: 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 "Strādāt Nesaistē"
 
@@ -26374,27 +26543,27 @@ msgstr "Strādāt Nesaistē"
 msgid "(No folder displayed)"
 msgstr "(Nav atēlota mape)"
 
-#: 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 "(Nekas)"
 
-#: 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 pašreiz ir tiešaistē. Klikšķiniet pogu lai strādātu "
 "netiešsaistē."
 
-#: 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 ir nesaistes režīmā iešanas procesā."
 
-#: 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 ""
@@ -26413,12 +26582,12 @@ msgstr ""
 "Kļūda no aktivizēšanas sistēmas ir:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nevar uzstādīt vietējo glabātuvi -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26429,19 +26598,19 @@ msgstr ""
 "ir pēkšņi aizvēries. Jums vajadzēs Evolution un pārstartēt\n"
 "lai tiktu atkal pie datiem."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Nepareizi argrumenti"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Nevar reģistrēties uz OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Konfigurāciju Datubāze nav atrasta"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Vispārēja kļūda"
 
@@ -26581,58 +26750,62 @@ msgstr "Saīsinājumi"
 msgid "Checkbox"
 msgstr "Krēsls"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Nav kļūdas"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Mape ar šadu nosaukumu jau eksistē"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Norādītais mapes tips nav pareizs"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "I/O kļūda"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Nav pietiekami vietas, lai izveidotu mapi"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Mape nav tukša"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Norādītā mape netika atrasta"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funkcija nav implementēta šajā glabātuvē"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operācija nav atbalstīta"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Norādītais tips nav atbalstīts šajā glabātuvē"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Norādītā mape nevar tikt mainīta vai izņemta"
 
-#: shell/e-storage.c: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 "Nevar izveidot mapi ar šādu nosaukumu"
 
+#: 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 (...)"
@@ -26849,9 +27022,10 @@ msgstr ""
 "Lūdzu klikšķiniet \"Nākošais\" pogu lai turpinātu."
 
 #: 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 ""
@@ -26869,26 +27043,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evoluion Importēšanas Asistents"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution Importētājasistents"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Importēt failu (solis 3 no 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Importētāja Tips (solis 1 no 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Izvēlieties Importētāju (solis 2 no 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Izvēlieties Failu (solis 2 no 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"
@@ -27105,10 +27275,10 @@ msgstr "pašreizējais laiks"
 #: 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 "_Darbības"
 
@@ -27227,7 +27397,7 @@ msgid "Print this item"
 msgstr "Drukāt šo priekšmetu"
 
 #: 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 "Saglabāt"
 
@@ -27254,7 +27424,7 @@ msgstr "Saglabāt šo priekšmetu uz diska"
 #: 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 "_Fails"
 
@@ -27336,7 +27506,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Plānot tikšanos šim priekšmetam"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Pārveidot Manu Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -27386,29 +27557,30 @@ msgid "Post a message to a Public folder"
 msgstr "Saglabājam vēstuli mapē"
 
 #: 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 "Parādīt vēstules pirmsapskata logu"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Pierakstīties vai atrakstīties uz/no mapēm uz attālinātajiem serveriem"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "Virtuālās Mapes R_edaktors..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_Apskata Lauks"
 
-#: 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 "Izmainīt rekvizītus šajai mapei"
@@ -27504,7 +27676,7 @@ msgstr "Sasaistīts Vēstuļu saraksts"
 msgid "_Expunge"
 msgstr "_Izdzēst"
 
-#: 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 "_Mape"
 
@@ -27820,7 +27992,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Meklēt tekstu attēlotajā vēstules rumpī"
 
 #: 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 "Uzstādīt lapas uzstādijumus tavam pašreizējam printerim"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -27934,7 +28107,7 @@ msgstr "Citēts"
 msgid "_Resend..."
 msgstr "Pā_rsaukt..."
 
-#: 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 "_Rīki"
 
@@ -27949,12 +28122,12 @@ msgstr "Aizvērt šo logu"
 #: 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 "_Aizvērt"
 
 #: 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 "_Skatīt"
 
@@ -28128,7 +28301,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Saglabāt šo priekšmetu un aizvērt dialoga logu"
 
-#: 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 "_Palīdzība"
 
@@ -28297,7 +28470,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Izveidot _Jaunu Mapi..."
 
 #: 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
@@ -28314,114 +28487,134 @@ msgid "Pi_lot Settings..."
 msgstr "_Pilot Uzstādījumi..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "_Pilot Uzstādījumi..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Izveidot _Jaunu Mapi..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Sūtīt / Saņemt"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Sūtīt sarindoto pastu un saņemt jaunu pastu"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Pasta Konfigurācija"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Pasta Konfigurācija"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Parādīt informāciju par Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Nosūtīt Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Nosūtīt _Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Nosūtīt kļūdu ziņojumu izmantojot Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Norādīt"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Norādīt, vai tiek rādīta mapes josla"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Norādīt, vai tiek rādīta saīsinājumu josla"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Norādīt, vai mēs strādājam nesaistes režīmā."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Parādīt izvēlēto mapi"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution VUJ"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "_Par Ximian Evolution"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Kopēt"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Mapes Josla"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Mape"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Iet Uz Mapi..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "I_mportēt..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Pārvietot..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Jauns"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Jauna Mape"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Bez A_tkārtošanās"
+msgid "_Remove Other User's Folder"
+msgstr "Izveidot _Jaunu Mapi..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "Pā_rsaukt..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Sūtīt / Saņemt"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Pasta uzstādījumi"
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Ī_sinājumikonas Josla"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "Ī_sinājumikona"
@@ -28664,11 +28857,11 @@ msgstr "Rakstzīmju Šifrēšana"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Meklēšanas Redaktors"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Saglabāt Meklēšanu"
 
@@ -28748,6 +28941,53 @@ msgstr "init_corba(): nevar initializēt GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nevar initializēt Bonobo"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "_Izņemt"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Pievienot"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Meklējam jaunās vēstules"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Mape nav tukša"
+
+#~ msgid "1 byte"
+#~ msgstr "1 baits"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u baiti"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Jūs aizmirsāt izvēlēties mapi.\n"
+#~ "Dodaties atpakaļ un izvēlieties pareizu mapi uz kurieni nosūtīt pastu."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s varētu netikt pārkonfigurēta, jo tā nav vietējā mape"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importējam %s\n"
+#~ "Importētājs nav gatavs.\n"
+#~ "Gaidām 5 minutes, lai mēģinātu velreiz."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolution Importētājasistents"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Bez A_tkārtošanās"
+
 #~ msgid "Error in search expression."
 #~ msgstr "Kļūda meklēšanas izteiksmē."
 
@@ -28789,15 +29029,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "Nepiedalās"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Šī vēstule netika nosūtīta.\n"
-#~ "\n"
-#~ "Vai tu vēlies saglabāt izmaiņas?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr "(noklusētais)"
@@ -29081,14 +29312,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Select a signature script"
 #~ msgstr "Izdzēst visu, bet ne parakstu"
 
-#, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML Paraksts:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Faila nosaukums:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML Paraksts:"
 
@@ -29119,14 +29342,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Riga"
 #~ msgstr "Rīga"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Pievienot"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "_Izņemt"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Vai jūs esat pārliecināti ka vēlaties izņemt \"%s\" mapi?"
 
@@ -29471,12 +29686,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Nevar atrast nevienu no identitātēm apmeklētāju sarakstā!\n"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Brīvs/Aizņemts informācija (%s uz %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "iCalendar informācija"
-
 #, fuzzy
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "satur"
@@ -29714,9 +29923,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_Uzdevums..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Pasta uzstādījumi"
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Pārsūtīt _Pievienotu"
 
diff --git a/po/nl.po b/po/nl.po
index 3b1076e8bd..120acac542 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 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-04-01 04:27+02:00\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -327,11 +327,17 @@ msgstr "Achternaam"
 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 "Lijst van andere contacten"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Meerdere Vkaarten"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "Vkaart voor %s"
@@ -342,47 +348,47 @@ msgstr "Vkaart voor %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 "Kon Bonobo niet initialiseren"
 
-#: 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 "Bezig met zoeken..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Verbinding met LDAP server wordt opgezet..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Kaart wordt toegevoegd aan 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 "Kaart wordt verwijderd van 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 "Kaart van LDAP server wordt aangepast..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "LDAP zoekresultaten komen binnen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Fout bij verwijderen kaart"
@@ -400,13 +406,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook niet 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 "Kon \"wombat\" server niet starten"
 
 #: 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 "Kon \"wombat\" niet starten"
@@ -475,10 +481,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Fabriek voor het voorbeeld Adresboekcontrol"
 
 #: 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 "Adresboek"
@@ -495,28 +501,38 @@ msgstr "LDAP Server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP server met contactinformatie"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Adresboek"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Map met contactinformatie"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Nieuw Contact"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "C_ontacten...."
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Nieuw contact maken"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Nieuwe Contactenlijst"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "Contacten _Lijst"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Maak een nieuwe contactenlijst"
@@ -566,7 +582,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL wordt niet ondersteund in deze versie van 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 "Kon Gnome-vfs niet initialiseren"
 
@@ -574,11 +590,11 @@ msgstr "Kon Gnome-vfs niet initialiseren"
 msgid "Other Contacts"
 msgstr "Andere Adresboeken"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Kan het adresboek niet openen"
 
-#: 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."
@@ -586,7 +602,7 @@ msgstr ""
 "Kan het adressenboek niet openen.  Controleer of het pad bestaat\n"
 "en of u het mag benaderen."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -597,7 +613,7 @@ msgstr ""
 "u een ongeldige URI heeft opgegeven of de LDAPserver\n"
 "down is."
 
-#: 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"
@@ -609,7 +625,7 @@ msgstr ""
 "moet u het programma vanuit de CVS sources meecompileren\n"
 "nadat u OpenLDAP van de link hierbeneden heeft opgehaald.\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"
@@ -620,38 +636,51 @@ msgstr ""
 "u een ongeldige URI heeft opgegeven of de LDAPserver\n"
 "down is."
 
-#: 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 ""
+"Fout bij het aanmelden bij de 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 "Voer uw wachtwoord in voor %s (gebruiker %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "eindigt op"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "eindigt op"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categorie is"
 
 #. 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 "Elk veld bevat"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Uitgebreid..."
 
-#: 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"
@@ -659,7 +688,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"
@@ -667,25 +696,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 "Elke Categorie"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Mapbladeraar zal laten zien"
 
@@ -752,53 +781,53 @@ msgid "  S_how Supported Bases "
 msgstr "_Controleer op ondersteunde types"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Opties"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "Verwijderen"
-
-#: 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 "Verwijderen"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opties"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -938,50 +967,56 @@ msgstr "Een"
 
 #: 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 " (standaard)"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr " (standaard)"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Zoek_gebied: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h: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 "Zoeken"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Alles Selecteren"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Verwijderd"
 
-#: 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"
@@ -992,7 +1027,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"
@@ -1001,47 +1036,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 "Bron Informatie"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Verbinden met 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 "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Niet ondersteund schema"
 
-#: 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"
@@ -1049,7 +1084,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"
@@ -1058,7 +1093,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"
@@ -1066,7 +1101,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"
@@ -1076,7 +1111,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"
@@ -1086,13 +1121,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 "
@@ -1102,7 +1137,7 @@ msgstr ""
 "Dit is het maximum aantal kaarten wat zal worden binnengehaald. Als u het te "
 "hoog zet wordt dit adresboek erg langzaam."
 
-#: addressbook/gui/component/ldap-config.glade.h: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 "
@@ -1112,7 +1147,7 @@ msgstr ""
 "op \"Email adres\" wordt gezet, is anonieme toegang tot de ldap server "
 "vereist."
 
-#: 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 "
@@ -1122,7 +1157,7 @@ msgstr ""
 "Deze naam wordt gebruikt om uw account weer te geven. De naam is alleen voor "
 "weergave-doeleinden."
 
-#: addressbook/gui/component/ldap-config.glade.h: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"
@@ -1130,11 +1165,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"
@@ -1143,26 +1178,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 "Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "Emailadres"
 
-#: 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,51 +1205,51 @@ msgstr ""
 msgid "_Add"
 msgstr "_Toevoegen"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_Toevoegen"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Actie Toevoegen"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Actie Toevoegen"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Albany"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "Verwijder Alles"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Weergave"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Distinguished 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Downloadlimiet"
 
-#: 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
@@ -1224,103 +1259,103 @@ msgstr "_Downloadlimiet"
 msgid "_Edit"
 msgstr "B_ewerken..."
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Afspraak bewerken"
 
-#: 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 "_Opties"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Poort:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr " (standaard)"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "Zoek_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Servernaam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Sluimertijd (minuten)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Account %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "Contactlijstbewerker"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Geen kaarten"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Bezig met opnieuw verbinden met %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 "Algemeen"
 
-#: 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 "Zoeken"
@@ -1335,8 +1370,8 @@ msgstr "Factory voor de naamselectie-interface van het Adresboek"
 
 #. 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 +1402,11 @@ msgstr "(%d niet weergegeven)"
 msgid "Unnamed Contact"
 msgstr "Ander contact"
 
-#: 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 "Selecteer Contacten uit het Adresboek"
 
-#: 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 "Verzender bevat"
@@ -1445,7 +1480,7 @@ msgid "D_epartment:"
 msgstr "Afd_eling:"
 
 #: 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"
 
@@ -1504,13 +1539,13 @@ msgstr "Bij voorkeur _HTML-berichten"
 
 #: 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 "_Verwijderen"
 
@@ -1538,1024 +1573,1024 @@ msgstr "_Publieke Kalender URL:"
 msgid "_Web page address:"
 msgstr "Homepage:"
 
-#: 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 "Verenigde Staten"
 
-#: 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 "Albani�"
 
-#: 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 "Algerije"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Amerikaans 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 "Antarctica"
 
-#: 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 en 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 "Argentini�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "Armeni�"
 
-#: 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 "Australi�"
 
-#: 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 "Oostenrijk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbaidjan"
 
-#: 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's"
 
-#: 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 "Wit Rusland"
 
-#: 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 "Belgi�"
 
-#: 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 "Bolivi�"
 
-#: 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 "Bosni�-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 Eiland"
 
-#: 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 "Brazili�"
 
-#: 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 "Brits Indische Oceaan Territorium"
 
-#: 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 "Bulgarije"
 
-#: 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 "Kameroen"
 
-#: 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 "Kaapverdische Eilanden"
 
-#: 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 "Kaaimaneilanden"
 
-#: 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 "Centraal Afrikaanse Republiek"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Tsjaad"
 
-#: 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 "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 "Kerstmis-Eiland"
 
-#: 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) Eilanden"
 
-#: 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 "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 "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 Eilanden"
 
-#: 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 "Ivoorkust"
 
-#: 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 "Kroati�"
 
-#: 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 "Cyprus"
 
-#: 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 "Tsjechi�"
 
-#: 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 "Denemarken"
 
-#: 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 "Dominicaanse Republiek"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Oost 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 "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 "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 "Equatoriaal Guinee"
 
-#: 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 "Ethiopi�"
 
-#: 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 eilanden"
 
-#: 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�r Eilanden"
 
-#: 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 "Frankrijk"
 
-#: 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 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 "Frans Polinesi�"
 
-#: 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 "Frans Zuidelijke Territori�n"
 
-#: 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 "Georgi�"
 
-#: 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 "Duitsland"
 
-#: 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 "Griekenland"
 
-#: 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 "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 "Guinee"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Guinee-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 "Ha�ti"
 
-#: 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 en McDonald Eilanden"
 
-#: 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 "Hongarije"
 
-#: 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 "IJsland"
 
-#: 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 "Indonesi�"
 
-#: 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 "Ierland"
 
-#: 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 "Itali�"
 
-#: 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 "Jordani�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazachstan"
 
-#: 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 "Noord 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 "Koeweit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kirgizi�"
 
-#: 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 "Litouwen"
 
-#: 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 "Maca�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Macedoni�"
 
-#: 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 "Maleisi�"
 
-#: 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 Eilanden"
 
-#: 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 "Mauritani�"
 
-#: 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 "Micronesi�"
 
-#: 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 "Moldavi�"
 
-#: 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 "Mongoli�"
 
-#: 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 "Namibi�"
 
-#: 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 "Nederland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Nederlandse 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 "Nieuw Caledoni�"
 
-#: 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 "Nieuw Zeeland"
 
-#: 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 Eiland"
 
-#: 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 "Noordelijke Mariana Eilanden"
 
-#: 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 "Noorwegen"
 
-#: 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 "Palesteins Territorium"
 
-#: 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 "Papoea Nieuw 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 "Filippijnen"
 
-#: 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 "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 "Roemeni�"
 
-#: 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 en 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 "Saint Vincent en de 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 "Sao Tome en 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 "Saoedi-Arabi�"
 
-#: 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 "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 "Slowakije"
 
-#: 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 "Sloveni�"
 
-#: 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 Eilanden"
 
-#: 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 "Zuid-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 "Zuid Georgi� en de Zuidelijke Sandwich Eilanden"
 
-#: 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 "Spanje"
 
-#: 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 en Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Soedan"
 
-#: 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 "Svalbard en Jan Mayen Eilanden"
 
-#: 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 "Zweden"
 
-#: 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 "Zwitserland"
 
-#: 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 "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 en Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunesi�"
 
-#: 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 "Turkije"
 
-#: 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 "Turkse en Caicos Eilanden"
 
-#: 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 "Oeganda"
 
-#: 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 "Oekra�ne"
 
-#: 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 "Verenigde Arabische Emiraten"
 
-#: 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 "Verenigd Koninkrijk"
 
-#: 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 "Amerikaanse Kleine Eilanden"
 
-#: 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 "Oezbekistan"
 
-#: 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 "Vi�tnam"
 
-#: 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 "Britse Maagdeneilanden"
 
-#: 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 "Amerikaanse Maagdeneilanden"
 
-#: 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 en Futuna Eilanden"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Westelijke 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 "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 "Joegoslavi�"
 
-#: 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"
 
@@ -2592,20 +2627,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kon geen widget vinden voor een veld: `%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 "Contact snel toevoegen"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Volledig bewerken"
 
-#: 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 "Volledige Naam:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "Email"
 
@@ -2627,6 +2662,19 @@ msgstr ""
 "%s bestaat reeds\n"
 "Wilt u het overschrijven?"
 
+#: 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 "Bestand overschrijven?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adres _2:"
@@ -2757,7 +2805,7 @@ msgstr "Contactlijstbewerker"
 msgid "Contact List Editor"
 msgstr "Contactenlijst bewerken"
 
-#: 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 "Lijst opslaan als VCard"
 
@@ -2807,7 +2855,7 @@ msgstr ""
 "in deze map. Wilt u het toch toevoegen?"
 
 #: 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 "Uitgebreid zoeken"
 
@@ -2816,24 +2864,24 @@ msgstr "Uitgebreid zoeken"
 msgid "Search"
 msgstr "Zoeken"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Geen kaarten"
 
-#: 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 kaarten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 msgid "Error getting book view"
 msgstr "Fout bij weergave boekvorm"
 
-#: 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"
@@ -2845,10 +2893,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 "Onbekende fout"
 
@@ -2856,7 +2904,7 @@ msgstr "Onbekende fout"
 msgid "Repository offline"
 msgstr "Opslagplaats 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 "Operatie niet toegestaan"
@@ -2877,8 +2925,8 @@ msgstr "Protocol niet ondersteund"
 #: 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 "Geannuleerd"
 
@@ -2929,7 +2977,7 @@ msgstr "Fout bij verwijderen lijst"
 
 #: 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 "Fout bij verwijderen kaart"
 
@@ -2942,11 +2990,10 @@ msgid "Display Cards"
 msgstr "Kaarten weergeven"
 
 #: 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 ""
 "U heeft aangegeven dat %d kaarten worden weergegeven als kaarten. Er zullen %"
 "d\n"
@@ -3035,7 +3082,7 @@ msgstr "Adresboek"
 
 #: 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 "Opslaan als VCard"
@@ -3119,7 +3166,7 @@ msgstr "Kopi�ren"
 msgid "Paste"
 msgstr "Plakken"
 
-#: 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
@@ -3127,8 +3174,8 @@ msgstr "Plakken"
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: 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 "_Huidige Weergave"
@@ -3137,7 +3184,7 @@ msgstr "_Huidige Weergave"
 #. 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"
 
@@ -3145,11 +3192,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"
@@ -3281,7 +3328,7 @@ msgid "Include:"
 msgstr "Insluiten:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Liggend"
 
@@ -3306,7 +3353,7 @@ msgid "Options"
 msgstr "Opties"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Ori�ntatie"
 
@@ -3329,7 +3376,7 @@ msgstr "Papierbron:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Staand"
 
@@ -3391,20 +3438,20 @@ msgstr "Afspraak zonder titel"
 
 #: 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 "Hoog"
 
 #: 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 "Normaal"
 
 #: 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 "Laag"
 
@@ -3415,13 +3462,17 @@ msgstr "Laag"
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
-#: 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 "Fout tijdens communiceren met kalenderserver"
 
-#: 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 "Kon Kalendergegevens niet uit de pilot lezen"
 
@@ -3532,11 +3583,11 @@ msgstr "Sluimertijd (minuten)"
 msgid "_Edit appointment"
 msgstr "_Afspraak bewerken"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Geen beschrijving beschikbaar."
 
-#: 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 ""
 "u dit ingesteld. Evolution zal in plaats daarvan een\n"
 "normaal dialoogvenster weergeven als herinnering."
 
-#: 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 "Waarschuwing"
 
-#: 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 "
@@ -3571,15 +3622,15 @@ msgstr ""
 "\n"
 "Weet u zeker dat dit programma gestart moet worden?"
 
-#: 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 "Dit bericht niet meer weergeven voor dit programma."
 
-#: 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 "Kon GNOME niet initialiseren"
 
-#: 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 "Cre�eren van de alarmnotificatie-dienst is mislukt:"
 
@@ -3628,7 +3679,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 "Kalenderweergave mislukt.  Controleer uw ORBit en OAF instellingen."
@@ -3705,9 +3756,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
@@ -3724,13 +3775,13 @@ msgid "Assigned"
 msgstr "Toegewezen"
 
 #: 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 "Nee"
 
@@ -3750,76 +3801,96 @@ msgstr "Week Weergave"
 msgid "Month View"
 msgstr "Maand Weergave"
 
-#: 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 "Folder met afspraken en gebeurtenissen"
 
-#: 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 "_Publieke Kalender URL:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Folder met afspraken en gebeurtenissen"
+
+#: 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 "Taken"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Map met to-do items"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Kaarten afdrukken"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Map met to-do items"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "_Vergadering"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 msgid "Create a new meeting request"
 msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Taak"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe afspraak"
@@ -3863,30 +3934,31 @@ msgid "Alarm Repeat"
 msgstr "Alarmherhaling"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
+#, fuzzy
+msgid ""
+"Evolution does not yet support email notification for reminders.  You will "
+"not be able to edit the options for this reminder."
+msgstr ""
+"Dit is een email herinnering, maar Evolution kan nog geen email "
+"herininneringen sturen. U zal de instellingen niet kunnen aanpassen voor "
+"deze herinnering."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Bericht"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Speel een geluid af:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Herhaal het Alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Start een programma:"
 
-#: 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 ""
-"Dit is een email herinnering, maar Evolution kan nog geen email "
-"herininneringen sturen. U zal de instellingen niet kunnen aanpassen voor "
-"deze herinnering."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Met deze parameters:"
@@ -3910,110 +3982,110 @@ msgstr "uren"
 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 dagen"
 
-#: 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 weken"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 week"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d uren"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 uur"
 
-#: 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 minuut"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
 
-#: 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 "Speel een geluid af"
 
-#: 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 "Toon een bericht"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Verstuur een bericht"
 
-#: 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 "Start een programma"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Opdracht om uit te voeren onbekend"
 
-#: 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 voor het begin van de afspraak"
 
-#: 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 na het begin van de afspraak"
 
-#: 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 bij het begin van de afspraak"
 
-#: 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 voor het einde van de afspraak"
 
-#: 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 na het einde van de afspraak"
 
-#: 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 bij het einde van de afspraak"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s bij %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 voor een onbekend triggertype"
@@ -4034,7 +4106,7 @@ msgstr "Herinneringen"
 
 #: 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 "Samenvatting:"
 
@@ -4117,7 +4189,7 @@ msgid "Days"
 msgstr "Dagen"
 
 #: 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 "Vrijdag"
 
@@ -4130,7 +4202,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 "Maandag"
 
@@ -4140,7 +4212,7 @@ msgid "S_un"
 msgstr "Z_on"
 
 #: 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 "Zaterdag"
 
@@ -4153,7 +4225,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Toon weeknummers in datum navigator"
 
 #: 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 "Zondag"
 
@@ -4172,7 +4244,7 @@ msgid "Task List"
 msgstr "_Taken Lijst"
 
 #: 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 "Donderdag"
 
@@ -4189,7 +4261,7 @@ msgid "Time format:"
 msgstr "Tijdsformaat:"
 
 #: 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 "Dinsdag"
 
@@ -4198,7 +4270,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 "Woensdag"
 
@@ -4425,8 +4497,8 @@ msgid "No summary"
 msgstr "Geen samenvatting"
 
 #: 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 "Opslaan als..."
 
@@ -4495,27 +4567,27 @@ msgstr "Overdragen Aan:"
 msgid "Enter Delegate"
 msgstr "Voer Gemachtigde in"
 
-#: 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 "Afspraak"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Herhaling"
 
-#: 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 "Bijeenkomst Plannen"
 
-#: 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 "Vergadering"
 
@@ -4584,19 +4656,19 @@ msgstr "_Eindtijd:"
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Er is minstens ��n aanwezige nodig."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Die persoon bezoekt de bijeenkomst reeds!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Overdragen Aan..."
 
@@ -4636,7 +4708,7 @@ msgid "Member"
 msgstr "Lid"
 
 #: 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"
@@ -4648,7 +4720,7 @@ msgstr "Rol"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4724,48 +4796,48 @@ msgstr "e"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Deze afspraak bevat herhalingen die Evolution niet kan bewerken."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "op"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "lijst"
 
-#: 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
 #, fuzzy
 msgid "third"
 msgstr "Overige"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "Noord"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "lijst"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Andere 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 "op de"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
@@ -4857,7 +4929,7 @@ msgstr "Voltooiingsdatum:"
 
 #: 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 "Heeft Actie Nodig"
 
@@ -4866,7 +4938,7 @@ msgid "Progress"
 msgstr "Voortgang"
 
 #: 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:"
 
@@ -4878,17 +4950,17 @@ msgstr "_Prioriteit:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Basis"
 
-#: 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 "Opdracht"
 
-#: 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:"
@@ -4958,12 +5030,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 "Geselecteerde objecten verwijderen"
 
-#: 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 "_Openen"
@@ -4973,30 +5045,30 @@ msgstr "_Openen"
 msgid "_Save as..."
 msgstr "Opslaan als..."
 
-#: 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 "_Afdrukken..."
 
-#: 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_nippen"
 
-#: 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�ren"
 
-#: 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"
@@ -5025,12 +5097,12 @@ msgstr "_Markeer de Taken als Voltooid"
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: 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 "Objecten worden ververst"
 
-#: 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 hier om een taak toe te voegen"
@@ -5039,8 +5111,8 @@ msgstr "Klik hier om een taak toe te voegen"
 msgid "Alarms"
 msgstr "Alarmen"
 
-#: 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 "Voltooid"
 
@@ -5069,7 +5141,7 @@ msgid "Start Date"
 msgstr "Begindatum"
 
 #: 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 "Samenvatting"
@@ -5136,123 +5208,123 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Nieuwe _Afspraak"
 
-#: 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 "Gebeurtenis voor de hele dag"
 
-#: 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 "Nieuwe vergadering"
 
-#: 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 "Nieuwe Taak"
 
-#: 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 "Afdrukken..."
 
-#: 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 "Ga Naar _Vandaag"
 
-#: 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 "_Ga Naar 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 "_Publiceer Beschikbaarheidsinformatie"
 
-#: 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 "Configureer %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 "Configureer %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 "_Opslaan Als..."
 
-#: 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 "_Bijeenkomst Plannen"
 
-#: 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 "Doorsturen als 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 "Maak deze Gebeurtenis Verplaatsbaar"
 
-#: 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 "Verwijder deze Gebeurtenis"
 
-#: 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 "Verwijder alle Gebeurtenissen"
 
-#: 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 "Het gereedschap voor GNOME Pilot lijkt niet ge�nstalleerd te zijn."
 
-#: 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 "Fout bij uitvoeren filter %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 "Eindigt: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Voltooid"
 
-#: 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 Informatie"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "iCalendar Fout"
 
-#: 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 "Een onbekende persoon"
 
 #. 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."
@@ -5260,327 +5332,333 @@ msgstr ""
 "<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
 "hieronder."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Geen</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "Geografische Locatie: "
 
-#: 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 "Geaccepteerd"
 
-#: 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 "Voorlopig Geaccepteerd"
 
-#: 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 "Geweigerd"
 
-#: 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 "Onbekend"
 
-#: 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 "Kies een actie:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Verversen"
 
-#: 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 "Accepteren"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Weigeren"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Verstuur Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Ververs antwoordstatus"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Verstuur Laatste Informatie"
 
-#: 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 "Annuleren"
 
-#: 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> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Bijeenkomst Informatie"
 
-#: 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> verzoekt u bij de bijeenkomst aanwezig te zijn."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Vergadering Voorstel"
 
-#: 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> wil graag aan een bestaande bijeenkomst bijdragen."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Vergadering Update"
 
-#: 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> wil graag  de laatste bijeenkomstgegevens ontvangen."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "VergaderingsUpdate Verzoek"
 
-#: 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> heeft geantwoord op een bijeenkomstverzoek."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Bijeenkomst Antwoord"
 
-#: 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> heeft een bijeenkomst geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Bijeenkomst Annulering"
 
-#: 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> heeft een onleesbaar bericht gestuurd."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Fout Bijeenkomstbericht"
 
-#: 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> heeft taakgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Taak Informatie"
 
-#: 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> verzoekt u een taak uit te voeren."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Taak Voorstel"
 
-#: 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> wil graag iets toevoegen aan een bestaande taak."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Taak Update"
 
-#: 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> wil graag de laatste taakgegevens ontvangen."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Taak Update Verzoek"
 
-#: 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> heeft een taakopdracht beantwoord."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Taak Antwoord"
 
-#: 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> heeft een taak geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Taak Annulering"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Fout Taakbericht"
 
-#: 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> heeft vrij/bezet informatie gepubliceerd."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Vrij/Bezet Informatie"
 
-#: 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> vraagt om uw beschikbaarheidsinformatie."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Vrij/Bezet Verzoek"
 
-#: 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> heeft een verzoek om beschikbaarheidsinformatie beantwoord."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Vrij/Bezet Antwoord"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Foutief Vrij/Bezet Bericht"
 
-#: 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 "Het bericht lijkt niet goed opgemaakt te zijn"
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
 
-#: 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 "De bijlage bevat geen geldig kalenderbericht"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
 
-#: 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 "Er trad een fout op bij het downloaden van gegevens voor"
 
-#: 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 "Dit item kon niet verzonden worden!\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 "Kon de map in `%s' niet openen"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Calenderbestand kon niet bijgewerkt worden!\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 ""
 "Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
 
-#: 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 ""
 "Bezoekerstatus kon niet ververst worden vanwege een ongeldige 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 "Kon de map in `%s' niet openen"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: 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 Verzonden!\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 "Dit item kon niet verzonden worden!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Selecteer Map"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Selecteer Map"
@@ -5626,7 +5704,7 @@ msgstr "begindatum"
 msgid "Chair Persons"
 msgstr "Voorzitters"
 
-#: 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 "Vereiste Deelnemers"
 
@@ -5640,52 +5718,52 @@ msgid "Resources"
 msgstr "Hulpbron"
 
 #: 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 "Persoon"
 
 #: 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 "Groep"
 
 #: 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 "Hulpbron"
 
 #: 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 "Kamer"
 
 #: 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 "Voorzitter"
 
 #: 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 "Vereiste Deelnemer"
 
 #: 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 "Optionele Deelnemer"
 
 #: 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 "Niet-Deelnemer"
 
 #: 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 "Voorlopig"
 
 #: 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 "Overgedragen"
 
@@ -5775,42 +5853,49 @@ msgstr "Aanvang _bijeenkomst:"
 msgid "Meeting _end time:"
 msgstr "_Einde bijeenkomst:"
 
-#: 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 "Bezig met openen taken op %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 "Kon de taken in `%s' niet laden"
 
-#: 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 "De methode die nodig is om `%s' te laden wordt niet ondersteund"
 
-#: 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 "Kon de map in `%s' niet openen"
 
-#: 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 "Fout bij laden %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Voltooiingsdatum"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten verwijderen"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Bezig met Schrappen"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Nieuwe _Afspraak..."
 
@@ -5824,7 +5909,13 @@ msgstr "Kon de map in `%s' niet openen"
 msgid "The method required to open `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te openen word niet ondersteund"
 
-#: 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 op %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5832,7 +5923,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"
@@ -5840,12 +5931,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 "Bezig met openen kalender op %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Bezig met openen map %s"
@@ -5906,49 +5997,58 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Er is minstens ��n bezoeker nodig"
-
-#: 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 "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Er is minstens ��n bezoeker nodig"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Gebeurtenis informatie"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Taak informatie"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Journaal informatie"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Vrij/Bezet informatie"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Kalenderinformatie"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Verversen"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Lijst Verversen"
 
-#: 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 "Vrij/Bezet informatie (%s tot %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "iCalendar informatie"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
@@ -6184,7 +6284,7 @@ msgid "Print Calendar"
 msgstr "Kalender afdrukken"
 
 #: 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 "Afdrukvoorbeeld"
@@ -6207,7 +6307,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "De URI van de te tonen takenmap"
 
-#: 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"
@@ -6219,12 +6319,12 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: 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 "Dit bericht niet meer weergeven."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Kaarten afdrukken"
@@ -6295,17 +6395,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Kon niet verbinden met de opslag: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Herinnering"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalenderbericht"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6314,84 +6414,84 @@ msgstr ""
 "Evolution heeft Pine mailbestanden gevonden.\n"
 "Wilt u deze importeren naar 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 "time-now verwacht 0 argumenten"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time verwacht 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 verwacht dat argument 1 een string is"
 
-#: 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 argument 1 moet een ISO-8601 date/time string zijn"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day verwacht 2 argumenten"
 
-#: 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 verwacht dat argument 1 een time_t is"
 
-#: 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 verwacht dat argument 2 een integer is"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin verwacht 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-bewgin verwacht dat argument 1 een time_t is"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-dat-end verwacht 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-dat-end verwacht dat argument 1 een time_t is"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype verwacht geen argumenten"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? verwacht 2 argumenten"
 
-#: 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? verwacht dat argument 1 een time_t is"
 
-#: 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? verwacht dat argument 2 een time_t is"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "Bevat? verwacht 2 argumenten"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? verwacht dat argument 1 een string is"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? verwacht dat argument 2 een string is"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6399,11 +6499,11 @@ msgstr ""
 "contains? verwacht dat argument 1 een kleuze is uit \"any\",\"summary\","
 "\"description\""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? verwacht op zijn minst 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)"
@@ -6411,22 +6511,27 @@ msgstr ""
 "has-categories? verwacht dat alle argumenten strings zijn, of dat slechts "
 "een argument booleaans onwaar is (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? verwacht 0 argumenten"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? verwacht 1 argumenten"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? verwacht dat argument 1 een time_t is"
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluation of the search expression did not yield a boolean value"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Onbekende fout"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8020,81 +8125,81 @@ msgstr "Bezig met opslaan map '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "U moet online werken om deze bewerking te voltooien"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Bezig met synchroniseren map"
 
-#: 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 "Fout bij interpreten bestand: %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 "Fout bij uitvoeren filter: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Kan de spoolmap niet openen"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Kan de spoolmap niet verwerken"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ophalen bericht %d(%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Kan bericht niet opnemen"
 
-#: 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 "Faalde bij bericht %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 "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Bezig met ophalen bericht %d van %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Faalde bij bericht %d van %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Ophalen bericht mislukt"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ongeldige argumenten"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ongeldige argumenten"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Faalde bij cachen bericht %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 "Faalde bij cachen bericht %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 "Fout bij uitvoeren filterzoekactie: %s: %s"
@@ -8141,11 +8246,11 @@ msgstr "Opdracht wordt niet ondersteund: zoeken op expressie: voor %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Opdracht wordt niet ondersteund: zoeken op uids: voor %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Verplaatsen van berichten"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Bezig met het kopi�ren van berichten naar %s"
@@ -8470,7 +8575,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 "Fout aanmeldingsantwoord van server."
 
@@ -8532,52 +8637,52 @@ msgstr "POP voor SMTP gebruikmakend van een niet-POP bron"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compileren van reguliere expressie mislukt: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' heeft een gebruikersnaamcomponent nodig"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' heeft een machinenaamcomponent nodig"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' heeft een padcomponent nodig"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving \"%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 "Fout bij opzoeken naam: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Machine niet gevonden: %s machine niet gevonden"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Machine opzoeken faalde: %s onbekende reden"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolving \"%s\""
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Machine niet gevonden: %s machine niet gevonden"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Machine opzoeken faalde: %s onbekende reden"
@@ -8776,7 +8881,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"
@@ -8789,11 +8894,11 @@ msgstr ""
 "Vingerafdruk:        %s\n"
 "Handtekening:        %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 "GOED"
 
-#: 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 "SLECHT"
 
@@ -8815,7 +8920,7 @@ msgstr ""
 "Wil je het alsnog accepteren?"
 
 #. 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"
@@ -8870,68 +8975,76 @@ msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
 
-#: camel/providers/imap/camel-imap-command.c: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 "Operatie geannuleerd"
 
-#: 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 verbrak onverwacht de verbinding: %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 "Onverwacht antwoord van IMAP-server: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Onverwacht antwoord van 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-commando mislukt: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Het antwoord van de server eindigde te snel."
 
-#: 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 "Het antwoord van de IMAP-server bevatte geen %s informatie"
 
-#: 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 "De IMAP-server gaf onverwacht een 'OK' antwoord: %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 "Kon directory %s niet maken: %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 "Kon samenvatting voor %s niet laden"
 
-#: 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 "Map is vernietigd en opnieuw gemaakt op de server."
 
 #. 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 "Bezig met zoeken naar veranderde berichten"
 
-#: 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 "Ophalen bericht mislukt"
 
-#: 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
@@ -8947,28 +9060,24 @@ msgstr ""
 "Kan bericht niet verkrijgen: %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 "Een dergelijk bericht bestaat niet"
 
-#: 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 "Dit bericht is nu niet beschikbaar"
 
-#: 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 "Ophalen van samenvattingsinformatie van nieuwe berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Bezig met zoeken naar nieuwe berichten"
-
-#: 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 "Kon bericht inhoud niet vinden in FETCH-antwoord."
 
@@ -8985,6 +9094,11 @@ msgstr "Kon cache map %s niet openen"
 msgid "Failed to cache message %s: %s"
 msgstr "Faalde bij cachen bericht %s: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Faalde bij cachen bericht %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Controleren voor nieuwe email"
@@ -9033,77 +9147,72 @@ msgstr ""
 "Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
 "als platte tekst."
 
-#: 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 voor %s op %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 "Verbinding geannuleerd"
 
-#: 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 "Kon niet verbinden met %s (poort %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 ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %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 "Operatie niet ondersteund"
 
-#: 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 "Aanmelding mislukt"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "De map is niet leeg"
-
-#: 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 ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: 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 "Geen ondersteuning voor aanmeldingstype %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 "%sVoer het IMAP-wachtwoord voor %s@%s in"
 
-#: 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 "U heeft geen wachtwoord ingevoerd"
 
-#: 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"
@@ -9114,24 +9223,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 "Map `%s' bestaat niet."
 
-#: 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 "Mapnaam kan geen enter-teken bevatten."
 
-#: 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 "Onbekende fout: %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 "De map kan geen submappen bevatten"
 
@@ -9208,8 +9317,8 @@ msgstr ""
 "Voor het lezen en opslaan van lokale post in standaard mbox spool bestanden."
 
 #: 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 "Opslaglocatie %s is geen absoluut pad"
@@ -9221,7 +9330,7 @@ msgstr "Opslag `%s' is geen normale directory"
 
 #: 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 "Kan map niet verkrijgen: %s: %s"
@@ -9235,32 +9344,32 @@ msgstr "Lokale opslaglocaties hebben geen postbus-in"
 msgid "Local mail file %s"
 msgstr "Lokaal postbusbestand %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 "Kon de naam van map %s niet wijzigen naar %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 "Kon de naam van de map niet wijzigen: %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 "Kon samenvattingsbestand van map `%s' niet verwijderen: %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 "Kon indexbestand van map `%s' niet verwijderen: %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 "Kon samenvatting %s niet opslaan: %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 "Kan geen bericht toevoegen aan de korte inhoud: onbekende reden"
 
@@ -9280,6 +9389,7 @@ msgstr "Ongeldige berichtinhoud"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9291,12 +9401,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 "Map `%s' bestaat niet."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9322,7 +9434,8 @@ msgid "not a maildir directory"
 msgstr "geen maildir-directory"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c: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 "Kon map `%s' niet scannen: %s"
@@ -9352,7 +9465,7 @@ msgid "Storing folder"
 msgstr "Bezig met opslaan map"
 
 #: 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 map niet verkrijgen: %s: %s"
@@ -9521,40 +9634,45 @@ msgstr "`%s' is geen directory."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kon MH-postbus map niet openen: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spoolmappen kunnen niet hernoemd worden"
 
-#: 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 "Opslag `%s' is geen normale directory"
 
-#: 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 "Map `%s/%s' bestaat niet."
 
-#: 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' is geen normaal bestand."
+
+#: 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 bestand %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 "Spoolmappen kunnen niet hernoemd worden"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Spoolmappen kunnen niet hernoemd worden"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmappen kunnen niet gewist worden"
 
@@ -9648,47 +9766,47 @@ msgstr "Gebruik annuleren"
 msgid "Operation failed: %s"
 msgstr "Bewerking mislukt: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "POP-samenvatting aan het ophalen"
 
-#: 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 "Gebruiker geannuleerd"
 
-#: 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 "Kan POP-samenvatting niet verkrijgen: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Bezit met schrappen van verwijderde berichten"
 
-#: 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 "Geen bericht met 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 "Bezig met ophalen POP-bericht %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 "Kan bericht: %s niet verkrijgen: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Onbekende reden"
 
@@ -9960,45 +10078,45 @@ msgstr "Tijdelijke aanmeldingsfout"
 msgid "Authentication required"
 msgstr "Aanmelding is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Fout bij QUIT-respons"
 
-#: 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 ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %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 "Het bericht lijkt niet goed opgemaakt te zijn"
 
-#: 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 "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Fout bij DATA-respons"
 
-#: 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 ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: 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 "%sVoer het SMTP wachtwoord in voor %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"
@@ -10009,88 +10127,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 "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 "Postaflevering 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 berichten niet versturen: afzender niet geldig."
 
-#: 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 "Bezig met versturen bericht"
 
-#: 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 bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: 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 "Kan bericht niet versturen: een of meerdere ongeldige ontvangers"
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP Begroeting"
 
-#: 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 "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Fout bij RSET-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP Aanmelding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Fout bij aanmaken van SASL aanmeldingsobject"
 
-#: 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 "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH verzoek faalde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Fout aanmeldingsantwoord van 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 "Time-out tijdens 'MAIL FROM'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Fout bij 'MAIL FROM'-respons"
 
-#: 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 "Time-out tijdens 'RCPT TO'-verzoek: %s: bericht niet verzonden"
 
-#: 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> mislukt"
 
-#: 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 "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
@@ -10098,78 +10216,69 @@ msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr "Fout bij DATA-respons"
 
-#: 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 ""
 "Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
 "niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "DATA terminatie foutmelding."
 
-#: 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 "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "Fout bij RSET-respons"
 
-#: 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 "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "Fout bij QUIT-respons"
 
-#: 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 "bijlage"
 
-#: 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 "Verwijder het geselecteerde bestand uit de lijst van bijlages"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Bestand bijvoegen..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Voeg een bestand bij het bericht"
 
@@ -10201,7 +10310,7 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Probeer bijlage automatisch weer te geven"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
@@ -10212,45 +10321,45 @@ msgstr "Klik hier voor het adresboek"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Antwoordadres:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Van:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Aan:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: 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 "Geef de adressen die een kopie van het bericht moeten krijgen"
 
-#: 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."
@@ -10261,12 +10370,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 "Geen omschrijving"
@@ -10281,7 +10390,7 @@ msgstr "Voeg een bestand toe als bijlage"
 msgid "Could not create a PGP signature context"
 msgstr "Kon geen PGP handtekening-context maken"
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10290,34 +10399,34 @@ msgstr ""
 "Fout bij lezen bestand %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Waarschuwing"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Bestand bestaat reeds, overschrijven?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fout bij benaderen bestand: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van editor halen"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10326,7 +10435,7 @@ msgstr ""
 "Niet in staat te zoeken op bestand: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10335,7 +10444,7 @@ msgstr ""
 "Niet in staat om bestand: %s af te kappen\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10344,7 +10453,7 @@ msgstr ""
 "Fout bij automatisch opslaan bericht: %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?"
@@ -10353,28 +10462,39 @@ msgstr ""
 "gevonden.\n"
 "Wilt u dat deze hersteld worden?"
 
-#: 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 ""
+"Dit bericht is nog niet verstuurd.\n"
+"\n"
+"Wilt u de wijzingen opslaan?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Waarschuwing: Veranderd Bericht"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Bewaar handtekening"
 
-#: 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 "Stel een nieuw bericht op"
 
-#: 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."
@@ -10382,7 +10502,18 @@ msgstr ""
 "Kon het venster Opstellen niet aanmaken:\n"
 "Kan adresselectie niet activeren."
 
-#: 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 ""
+"Kon het venster voor het opstellen van het bericht niet maken:\n"
+"Niet in staat de HTML editor component te activeren."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10390,13 +10521,13 @@ msgstr ""
 "Kon het venster voor het opstellen van het bericht niet maken:\n"
 "Niet in staat de HTML editor component te activeren."
 
-#: composer/e-msg-composer.c: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."
@@ -10405,8 +10536,9 @@ msgstr ""
 "mislukt, want u heeft nog geen identiteitsgegevens geconfigureerd in het "
 "mail-component."
 
-#: 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 de berichtenopsteller van Evolution niet initialiseren."
 
 #: data/evolution.desktop.in.h:1
@@ -10457,8 +10589,8 @@ msgstr "Onderwerp bevat"
 msgid "Subject does not contain"
 msgstr "Onderwerp bevat niet"
 
-#: 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?"
@@ -10606,7 +10738,8 @@ msgid "years"
 msgstr "jaren"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Je bent vergeten een datum te kiezen."
 
 #: filter/filter-datespec.c:269
@@ -10662,15 +10795,12 @@ msgid "Add action"
 msgstr "Actie Toevoegen"
 
 #: 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 ""
-"U bent vergeten een map te kiezen.\n"
-"Ga terug en kies een geldige map om berichten in op te slaan"
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Geef Bestandsnaam:"
 
-#: 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 "Selecteer Map"
 
@@ -10683,7 +10813,7 @@ msgstr ""
 "Fout in reguliere expressie '%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 "Belangrijk"
@@ -10872,224 +11002,228 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "bevat"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Ontvangstdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Verzendingsdatum"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "bevat niet"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "eindigt niet op"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "klinkt niet als"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "begint niet met"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Klad"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "eindigt op"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Bestaat"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "bestaat"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr "Antwoord"
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "is"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "is na"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "is voor"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "is Gemarkeerd"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "is groter dan"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "is kleiner dan"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "is niet"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "Is niet Gemarkeerd"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c: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 "Mailinglijst"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Berichtinhoud"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Berichtkop"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Shellopdracht uitvoeren"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Speel een geluid af:"
 
-#: 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 "Gelezen"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Geadresseerden"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "is groter dan"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "is kleiner dan"
+#: filter/libfilter-i18n.h: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 "Afzender"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Stel Status in"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Shellopdracht uitvoeren"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Grootte (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "klinkt als"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Source-Account"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "begint met"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: 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 "Onderwerp"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Stel Status in"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "bevat"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "bevat niet"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "eindigt niet op"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "bestaat niet"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "bestaat niet"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "klinkt niet als"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "begint niet met"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "eindigt op"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "bestaat"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "is Gemarkeerd"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "is na"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "is voor"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "is groter dan"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "is kleiner dan"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "Is niet Gemarkeerd"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "is niet"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "is"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "is groter dan"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "is kleiner dan"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "klinkt als"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "begint met"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regel"
@@ -11123,31 +11257,31 @@ msgstr "U moet minstens ��n map als bron opgeven."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is uw oude Elm mail aan het importeren"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importeren..."
 
-#: 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 "Een ogenblik geduld aub"
 
-#: 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 "Importeren %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 "Bezig met doorzoeken %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"
 
@@ -11208,39 +11342,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 importeert uw oude Netscape informatie"
 
 #. 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 "Prullenbak"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokaal postbusbestand %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 "Map wordt gescant"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Importeren wordt gestart"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Instellingen:"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Filters Bewerken"
 
-#: 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?"
@@ -11358,26 +11492,36 @@ msgid "Folder containing mail"
 msgstr "Map die post bevat"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Openbaar"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Map die post bevat"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Virtueal Afval"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Virtuele Afvalmap"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Deze map kan geen berichten bevatten."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Verander de eigenschappen van deze map"
 
-#: 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."
@@ -11385,78 +11529,79 @@ msgstr ""
 "Sommige van uw email-instellingen lijken ongeldig, controleer alstublieft of "
 "alles goed staat."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post-transportmethode ingesteld"
 
-#: 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 "Waarschuwing: Veranderd Bericht"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Nieuw Bericht"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "Bericht"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Stel een nieuw bericht op"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Volgend Bericht"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Vorig Bericht"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nieuw Bericht"
 
-#: 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 de Mail-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan de mailconfiguratie-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan de Map-info-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Verbinden met server..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschappen voor \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: 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 "Kon tijdelijke directory niet maken: %s"
@@ -11501,141 +11646,141 @@ msgstr "%d verzonden"
 msgid "%d total"
 msgstr "%d totaal"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Maak VMap Van Bericht"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "VMap op Mailing_Lijst"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filter op Afzen_der"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: 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 op _Mailinglijst"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "B_ewerk als Nieuw Bericht..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: 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 "Afzender beantwoorden"
 
-#: 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 "Lijst Be_antwoorden"
 
-#: 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 "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Antwoord..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Markeer als Voltooid"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Markering Wissen"
 
 #. 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_keer als Gelezen"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markeer als O_ngelezen"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Markeer als _Belangrijk"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markeer Als _Onbelangrijk"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Verplaatsen naar Map..."
 
-#: 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 "_Kopi�ren naar Map..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Afzender aan Adresboek Toevoegen"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creeer Regel Van Bericht"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VMap op Mailinglijst"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter op Mailinglijst (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMap op Mailinglijst (%s)"
@@ -11709,20 +11854,20 @@ msgstr "U heeft niet alle informatie ingevuld die nodig is."
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbeheer"
 
-#: 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 "Computernaam:"
 
-#: 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 "Gebruikersnaam:"
 
-#: 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 "_Pad:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
 
@@ -11739,14 +11884,14 @@ msgid "Really delete account?"
 msgstr "Daadwerkelijk dit account verwijderen?"
 
 #: 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 "Uitzetten."
 
 #: 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 "Aanzetten"
 
@@ -11835,9 +11980,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 ""
 "U verstuurt een HTML-geformateerd bericht, maar de volgende ontvangers "
 "willen geen HTML emailtjes ontvangen:\n"
@@ -11881,7 +12027,7 @@ msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
-#: mail/mail-callbacks.c: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?"
@@ -11889,28 +12035,28 @@ msgstr ""
 "Kan de drafts map voor die account niet openen.\n"
 "Wilt u gebruik maken van de standaardmap?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "een onbekende afzender"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Op %a %d-%m-%Y, om %H:%M schreef %%s:"
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-#: 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 "Kopieer bericht(en) naar"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Weet u zeker dat u alle %d berichten wilt bewerken?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11918,7 +12064,7 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11926,32 +12072,32 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Geen bericht geselecteerd"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 msgid "Go to next folder with unread messages?"
 msgstr "Volgende map met ongelezen berichten tonen?"
 
-#: 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?"
@@ -11959,7 +12105,7 @@ msgstr ""
 "Er zijn geen nieuwe berichten meer in deze map.\n"
 "Wil je naar de volgende map gaan?"
 
-#: 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"
@@ -11971,7 +12117,7 @@ msgstr ""
 "\n"
 "De berichten echt verwijderen?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11980,65 +12126,65 @@ msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: 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 "Afdrukken van bericht mislukt"
 
-#: 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 ""
 "Weet u zeker dat alle %d berichten in een appart scherm wilt weergeven?"
 
-#: 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 "_Beveiliging"
 
-#: 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 "Ander contact"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Verzonden"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Bewaar handtekening"
@@ -12098,16 +12244,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistent"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Account"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Dienst wordt gecontroleerd"
 
-#: 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 "Verbinden met server..."
 
@@ -12826,78 +12972,74 @@ msgstr "Kon geen S/MIME envelope context maken"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kon geen S/MIME decode context maken"
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Bijlage Opslaan"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kon tijdelijke bestand '%s' niet maken: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Bijlage Opslaan"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Geef Ingebonden Weer (via %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 "Extern Weergave Programma"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Toon _Afbeeldingen"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Bezig met laden berichtinhoud"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Verlopen taken:"
 
-#: 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 "Open Link in Browser"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopieer Link Locatie"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Sla Link op als (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Sla Figuur op als..."
 
@@ -12906,109 +13048,110 @@ msgstr "Sla Figuur op als..."
 msgid "Pinging %s"
 msgstr "Bezig met doorzoeken %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Laat zien als 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 "Datum"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Ongeldig Emailadres"
 
-#: 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 "Van"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: 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 "Aan"
 
-#: 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 "Post"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Dit bericht is digitaal ondertekend. Klik op het hangslot icoontje voor meer "
 "informatie."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kon geen PGP verificatie context maken"
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Dit bericht is digitaal ondertekend en is authentiek."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond dat "
 "het authentiek is."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar 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 "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar externe gegevens (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte"
 
-#: 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 Mappen"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Map opnieuw configureren"
 
-#: 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"
@@ -13017,27 +13160,22 @@ msgstr ""
 "Kan map-metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan map-matainfo niet opslaan in %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan map-metagegevens %s niet verwijderen: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s mag niet opnieuw geconfigureerd worden omdat het geen lokale map is"
-
-#: 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."
@@ -13045,15 +13183,15 @@ msgstr ""
 "Als deze map niet meer kan worden geopend, dan is\n"
 "het wellicht noodzakelijk om deze handmatig te repareren."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "U kunt het formaat van een niet-lokale map niet veranderen."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Herconfigureer /%s"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "U kunt het formaat van een niet-lokale map niet veranderen."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13294,21 +13432,21 @@ msgstr "Aan het Wachten ..."
 msgid "User canceled operation."
 msgstr "Gebruiker heeft operatie afgebroken."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Onthoud dit wachtwoord"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Onthoud dit wachtwoord tot het einde van deze sessie"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Voer uw Wachtwoord in voor %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Voer Wachtwoord in"
 
@@ -13317,11 +13455,11 @@ msgstr "Voer Wachtwoord in"
 msgid "Could not save signature file: %s"
 msgstr "Kon handtekening-bestand niet opslaan."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Bewaar handtekening"
 
-#: 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"
@@ -13331,11 +13469,12 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: 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 "Bestand met _HTML-ondertekening:"
 
-#: 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 "Naam:"
 
@@ -13375,7 +13514,7 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: 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 "VMappen"
 
@@ -13406,67 +13545,67 @@ msgstr "(geen onderwerp)"
 msgid "%s - Message"
 msgstr "%s - Bericht"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Laagste"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Laag"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Hoog"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Hoogste"
 
-#: 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 "Vandaag %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %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 "Bezig met genereren van berichtenlijst"
 
@@ -13540,46 +13679,72 @@ msgstr "Iedereen beantwoorden"
 msgid "Review"
 msgstr "Voorbeeld"
 
-#: 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 "Antwoord"
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Voltooid"
+
+#: 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 "Markering Wissen"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Verloopdatum"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Bestandsnaam:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Bezig met scannen van mappen onder %s op \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Bezig met scannen van root-level mappen op \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Bezig met aanmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Bezig met afmelden van map \"%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 "Map"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Opslaan in _map..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Geen server geselecteerd"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Selecteer een server"
 
@@ -23482,12 +23647,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Geen omschrijving"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Samenvatting Post"
 
-#: 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 Mappen"
 
@@ -23502,23 +23667,23 @@ msgstr "Lokale Mappen"
 #. (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 "EHAM:EHEH:EHGG:EHLW:EHBK:EHRD:EHSB:EBAW:EBBR:EBLG:EBOS"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Woord van de Dag"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Quotes van de Dag"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Voeg een nieuwsbron toe"
 
-#: 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 "Geef the URL van de nieuwsbron die u wilt toevoegen"
 
@@ -23558,11 +23723,11 @@ msgstr "(Geen Omschrijving)"
 msgid "My Weather"
 msgstr "Mijn Weer"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr "Er trad een fout op bij het downloaden van gegevens voor"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Weer"
 
@@ -24889,6 +25054,11 @@ msgstr ""
 "Kan map niet overzetten:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Openen in %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25132,12 +25302,25 @@ msgid "Rename folder"
 msgstr "Hernoemen map"
 
 #: 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 "De opgegeven mapnaam is niet geldig: %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 ""
+"Kan map niet hernoemen:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25146,12 +25329,12 @@ msgstr ""
 "Kan de gespecificeerde map niet aanmaken:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "_Nieuwe map aanmaken..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nieuw..."
 
@@ -25181,20 +25364,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Kies de informatie die u zou willen importeren:"
 
-#. 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 ""
-"Importeren %s\n"
-"Importeerfunctie niet klaar.\n"
-"Wacht 5 seconden en probeer het opnieuw."
-
-#: 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"
@@ -25203,22 +25373,22 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Selecteer Map"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Map %s bestaat niet"
 
-#: 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 Fout"
 
-#: 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"
@@ -25227,11 +25397,11 @@ msgstr ""
 "Er is geen importeerfunctie die het volgende kan afhandelen\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Bezig met importeren"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25240,17 +25410,17 @@ msgstr ""
 "Importeren %s.\n"
 "Beginnen %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25259,31 +25429,31 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item 1."
 
-#: 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 "Bestandsnaam:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Bestandstype:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Importeer informatie en instellingen van oudere programma's"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importeer een enkel bestand"
 
-#: 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"
@@ -25291,24 +25461,24 @@ msgstr ""
 "Even geduld...\n"
 "Bestaande instellingen worden nagezocht"
 
-#: 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 "Intelligent Importeren wordt gestart"
 
-#: 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 "Van %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Selecteer Map"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Selecteer een doelmap voor deze belangrijke 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 "Importeer"
 
@@ -25336,32 +25506,32 @@ msgstr "Bezig met synchroniseren map"
 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 "Bezig met openen map %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 "Bezig met openen map %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 "Openen 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 "Kon de naam van de map niet wijzigen: %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 ""
@@ -25403,44 +25573,44 @@ msgstr "Mapnaam mag geen slashes bevatten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' en '..' zijn gereserveerde mapnamen."
 
-#: 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 kon niet worden gevonden in het $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 kon niet worden gestart."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Over Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Ga naar map..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Selecteer de map die je wilt openen"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Maak een nieuwe snelkoppeling"
 
-#: 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 "Selecteer de map waar de snelkoppeling naar moet wijzen:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "Werk Online"
 
-#: 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 "Werk 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 "Werk zonder netwerk"
 
@@ -25448,27 +25618,27 @@ msgstr "Werk zonder netwerk"
 msgid "(No folder displayed)"
 msgstr "(Geen map weergegeven)"
 
-#: 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 "(Geen)"
 
-#: 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 is nu verbonden met het netwerk.  Klik op deze knop om zonder "
 "netwerkverbinding te werken"
 
-#: 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 is in bezig offline te gaan."
 
-#: 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 ""
@@ -25486,12 +25656,12 @@ msgstr ""
 "De fout van het activeringssysteem is:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25503,19 +25673,19 @@ msgstr ""
 "gestopt. U zult Evolution opnieuw moeten starten om die informatie\n"
 "weer te kunnen benaderen."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Kan niet registreren op OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Configuratiedatabase niet gevonden"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Generieke fout"
 
@@ -25655,58 +25825,62 @@ msgstr "Snelkoppelingen"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Geen fout"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Een folder met die naam bestaat reeds"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Het gespecificeerde foldertype is niet geldig"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "I/O fout"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Niet genoeg ruimte vrij om de folder te maken"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "De map is niet leeg"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder is niet gevonden"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Functie niet ge�mplementeerd voor deze opslag"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operatie niet ondersteund"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "De opgegeven folder kan niet worden veranderd of verwijderd"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan de map niet verplaatsen naar een van zijn eigen kinderen"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Kan geen map met die naam maken"
 
+#: 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 (...)"
@@ -25921,9 +26095,10 @@ msgstr ""
 "Klik op \"Volgende\" te beginnen."
 
 #: 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 ""
@@ -25943,26 +26118,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolution Import Assistent"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution Import Assistent"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Importeer Bestand (stap 3 van 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Importeertype (stap 1 van 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Selecteer Importfunctie (stap 2 van 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Selecteer een bestand (stap 2 van 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"
@@ -26174,10 +26345,10 @@ msgstr "Huidige contact weergeven"
 #: 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 "_Acties"
 
@@ -26295,7 +26466,7 @@ msgid "Print this item"
 msgstr "Item afdrukken"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Opslaan"
 
@@ -26322,7 +26493,7 @@ msgstr "Bewaar dit item op de harde schijf"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Bestand"
 
@@ -26404,7 +26575,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Plan een bijeenkomst voor dit item"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Mijn Evolution Instellen"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26454,29 +26626,30 @@ msgid "Post a message to a Public folder"
 msgstr "Bezig met opslaan bericht in map"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Abonneren op Mappen..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Toon berichtenvoorbeeld-venster"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abboneer of zegt abbo op op de mappen op de server"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Virtuele-Mapbewerker..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filters..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "Voorbeeld Venster"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_Abonneren op Mappen..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Verander de eigenschappen van deze map"
@@ -26573,7 +26746,7 @@ msgstr "Toon Discussiebomen"
 msgid "_Expunge"
 msgstr "_Wissen"
 
-#: 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 "_Map"
 
@@ -26883,7 +27056,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
 #: 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 "Stel de pagina instellingen in voor de huidige printer"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26994,7 +27168,7 @@ msgstr "Ge_citeerd"
 msgid "_Resend..."
 msgstr "He_rnoemen..."
 
-#: 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 "_Gereedschap"
 
@@ -27009,12 +27183,12 @@ msgstr "Dit venster sluiten"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_Sluiten"
 
 #: 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 "Weerga_ve"
 
@@ -27188,7 +27362,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Bewaar dit item en sluit het dialoogvenster"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Help"
 
@@ -27355,7 +27529,7 @@ msgid "Open Other _User's Folder..."
 msgstr "_Nieuwe map aanmaken..."
 
 #: 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
@@ -27372,114 +27546,134 @@ msgid "Pi_lot Settings..."
 msgstr "_Pilot Instellingen..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "_Pilot Instellingen..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "_Nieuwe map aanmaken..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Versturen en Ontvangen"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Postconfiguratie"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Postconfiguratie"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Toon informatie over Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Bug-Report Insturen"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Report insturen met Bug Buddy."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Verander"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mappenbalk"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Schakel offline werken aan of uit"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Toon de geselecteerde map"
 
-#: 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 "_Over Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "Kopi�ren..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Mappenbalk"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Map"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Importeer..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "Verplaatsen..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nieuw"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Nieuwe Map"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Samenvatting Instellingen"
+msgid "_Remove Other User's Folder"
+msgstr "_Nieuwe map aanmaken..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "He_rnoemen..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Versturen en Ontvangen"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Postinstellingen..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Snelkoppelingsbalk"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Snelkoppeling"
@@ -27719,11 +27913,11 @@ msgstr "Karakterencodering"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Zoekopdracht-editor"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Bewaar Zoekopdracht"
 
@@ -27803,6 +27997,54 @@ msgstr "init_corba(): kon Gnome niet initializeren"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "Verwijderen"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Toevoegen"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Bezig met zoeken naar nieuwe berichten"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "De map is niet leeg"
+
+#~ 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 ""
+#~ "U bent vergeten een map te kiezen.\n"
+#~ "Ga terug en kies een geldige map om berichten in op te slaan"
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr ""
+#~ "%s mag niet opnieuw geconfigureerd worden omdat het geen lokale map is"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importeren %s\n"
+#~ "Importeerfunctie niet klaar.\n"
+#~ "Wacht 5 seconden en probeer het opnieuw."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolution Import Assistent"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Samenvatting Instellingen"
+
 #~ msgid "Error in search expression."
 #~ msgstr "Fout in zoekopdracht."
 
@@ -27847,15 +28089,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Non-Participants"
 #~ msgstr "Niet-Deelnemers"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Dit bericht is nog niet verstuurd.\n"
-#~ "\n"
-#~ "Wilt u de wijzingen opslaan?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (standaard)"
@@ -28213,10 +28446,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgstr "Bestand met _HTML-ondertekening:"
 
 #, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Bestandsnaam:"
-
-#, fuzzy
 #~ msgid "_HTML Signature:"
 #~ msgstr "Bestand met _HTML-ondertekening:"
 
@@ -28247,14 +28476,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Riga"
 #~ msgstr "Riga"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Toevoegen"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "Verwijderen"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Weet u zeker dat u de \"%s\" map wilt verwijderen?"
 
@@ -28641,10 +28862,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "seconds."
 #~ msgstr "seconden."
 
-#, fuzzy
-#~ msgid "use _HTML for this signature"
-#~ msgstr "Bestand met _HTML-ondertekening:"
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution herkent dit type ondertekening niet."
 
@@ -28916,12 +29133,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Kan geen van uw identiteiten vinden in de bezoekerlijst!\n"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Vrij/Bezet informatie (%s tot %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "iCalendar informatie"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Ongeldig type in bericht-bevat, verwacht een tekenreeks"
 
@@ -29089,9 +29300,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "_Task..."
 #~ msgstr "_Taak..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "Postinstellingen..."
-
 #, fuzzy
 #~ msgid "Forward As"
 #~ msgstr "Doorsturen"
diff --git a/po/nn.po b/po/nn.po
index e3e68598cf..3924eea788 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-1.01\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-01-30 06:10+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: \n"
@@ -318,11 +318,17 @@ msgstr "Etternamn"
 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 utan namn"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Fleire VKort"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VKort for %s"
@@ -333,46 +339,46 @@ msgstr "VKort 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 ikkje 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�kjer ..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Lastar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 msgid "Reconnecting to LDAP server..."
 msgstr "Koplar til LDAP-tenar att ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Legg til kort til LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Fjernar kort fr� LDAP-tenar ..."
 
-#: 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 "Endrar kort fr� LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Mottek LDAP-s�keresultat ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr "Feil ved s�k"
 
@@ -389,13 +395,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook vart ikkje lasta\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 "Klarte ikkje � starte wombat-tenar."
 
 #: 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 "Klarte ikkje � starte wombat."
@@ -462,10 +468,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Fabrikk for ein eksemple adressebokkontroll"
 
 #: 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"
@@ -482,27 +488,37 @@ msgstr "LDAP-tenar"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tenar som inneheld kontaktinformasjon"
 
-#: 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 inneheld kontaktinformasjon"
+
+#: 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
 msgid "Create a new contact"
 msgstr "Opprett 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
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 msgid "Create a new contact list"
 msgstr "Opprett ny kontaktliste"
 
@@ -512,8 +528,7 @@ msgstr "Klarte ikkje � kople til LDAP-tenar"
 
 #: addressbook/gui/component/addressbook-config.c:216
 msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Ikkje i stand til � autentisere mot IMAP-tenar"
+msgstr "Ikkje i stand til � autentisere mot IMAP-tenar"
 
 #: addressbook/gui/component/addressbook-config.c:239
 msgid "Could not perform query on Root DSE"
@@ -540,7 +555,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "LDAP var ikkje tatt med i denne versjonen av Evolution"
 
 #: addressbook/gui/component/addressbook-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 "Klarte ikkje � initialisere gnome-vfs"
 
@@ -548,24 +563,24 @@ msgstr "Klarte ikkje � initialisere 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 "Ikkje i stand � opne adresseboka"
 
-#: 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 +588,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
-#, 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 "Ikkje i stand til � autentisere mot IMAP-tenar"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "Oppgi passord for %s (brukar %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr "Namnet byrjar med"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 msgid "Email begins with"
 msgstr "E-post byrjar med"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori 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 "Nokon felt inneheld"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Avansert ..."
 
-#: 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 +642,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 +650,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 "Nokon kategori"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -710,49 +735,51 @@ msgid "  S_how Supported Bases "
 msgstr "Vel modemtype ..."
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-msgid "&lt;&lt; Fewer Options"
-msgstr "&lt;&lt; Ferre val"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "&lt;- _Remove"
-msgstr "&lt;- Fje_rn"
-
-#: 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 "Fje_rn"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "&lt;&lt; Ferre val"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -887,48 +914,54 @@ msgstr "Ein"
 
 #: 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 "Forvald"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Forvald"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "S�kes_kop:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h: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�ker"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Select"
 msgstr "Vel"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Selected:"
 msgstr "Valde:"
 
-#: 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"
@@ -939,7 +972,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"
@@ -948,47 +981,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 "Tenarinformasjon"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr " Koplar til tenar ..."
 
-#: 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 "Ust�tta skjema"
 
-#: 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"
@@ -996,7 +1029,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"
@@ -1005,7 +1038,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"
@@ -1013,7 +1046,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"
@@ -1023,7 +1056,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"
@@ -1033,27 +1066,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 "
@@ -1063,7 +1096,7 @@ msgstr ""
 "Namnet blir brukt til � identifisere kontoen din. Det er kun til for "
 "visningsf�rem�l."
 
-#: 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"
@@ -1071,11 +1104,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"
@@ -1084,25 +1117,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 "E-postadresse:"
 
-#: 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
@@ -1110,47 +1143,48 @@ msgstr ""
 msgid "_Add"
 msgstr "_Legg til"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
-msgstr "_Legg til -&gt;"
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Legg til"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Legg til handling"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Legg til handling"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Always"
 msgstr "_Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "S_lett 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
@@ -1160,103 +1194,103 @@ 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 avtale"
 
-#: 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 "_Val"
 
-#: 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 "Forvald"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "S�ke_base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Tenarnamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "L�g grense (minutt):"
 
-#: 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 "contact-list-editor"
 
-#: 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 "Koplar til %s p� nytt"
 
-#: 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 "Allment"
 
-#: 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�ker"
@@ -1272,8 +1306,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"
@@ -1304,11 +1338,11 @@ msgstr "(%d ikkje vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt utan namn"
 
-#: 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 "Avsendar inneheld"
@@ -1381,7 +1415,7 @@ msgid "D_epartment:"
 msgstr "Avd_eling:"
 
 #: 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 "Detaljar"
 
@@ -1438,13 +1472,13 @@ msgstr "Vil motta _HTML-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c: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 "_Slett"
 
@@ -1472,1028 +1506,1028 @@ msgstr "_Offentleg kalendar-URL:"
 msgid "_Web page address:"
 msgstr "_Nettsideaddresse"
 
-#: 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 "USA"
 
-#: 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 "Algerie"
 
-#: 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 "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 "Austerrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Aserbadjan"
 
-#: 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 "Kviterussland"
 
-#: 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 "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 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 Island"
 
-#: 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 "Britisk Indisk sj�territorium"
 
-#: 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 "Kambodsja"
 
-#: 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 "Cape 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 Islands"
 
-#: 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 "Den Sentralafrikanske republikken"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Tjad"
 
-#: 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 "Christmas Island"
 
-#: 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) Islands"
 
-#: 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 "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 Islands"
 
-#: 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 "Cote 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 "Krotia"
 
-#: 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 "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 "Tjekkisk republikk"
 
-#: 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 "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 "Dominikanske republikk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Aust-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 "Egypt"
 
-#: 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 "Ekvatorial 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 "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 "Falklands�yane"
 
-#: 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�yane"
 
-#: 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 "Frankrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "French 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 "French 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 "Fransk s�rleg territoriar"
 
-#: 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 "Hellas"
 
-#: 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 And McDonald Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "Den heilage sj�"
 
-#: 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 "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 "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 "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 "Japansk"
 
-#: 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 "Kasakstan"
 
-#: 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 "Korea, Republic of"
 
-#: 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 "Kirgistan"
 
-#: 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 "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 "Makedonia"
 
-#: 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 "Maldivane"
 
-#: 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 Islands"
 
-#: 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 "Mauritania"
 
-#: 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 "Mikronesia"
 
-#: 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, Republic of"
 
-#: 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 "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 "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 "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 "Nederland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Nederlandske antillar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "New 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 "Ny 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 Island"
 
-#: 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 "Northern Mariana Islands"
 
-#: 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 "Noreg"
 
-#: 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 "Palestina"
 
-#: 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 New 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 "Fillipinene"
 
-#: 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 "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 "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 "Russland"
 
-#: 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 And 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 And 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 "Sao Tome And 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 "Seychellene"
 
-#: 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 "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 "Slovenia"
 
-#: 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 Islands"
 
-#: 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�r-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 "South Georgia And The South Sandwich Islands"
 
-#: 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 "Spania"
 
-#: 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 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 "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 "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 "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 "Sveits"
 
-#: 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 "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 "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 "Tyrkia"
 
-#: 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 And Caicos Islands"
 
-#: 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 "Ukrainia"
 
-#: 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 "Forente 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 "Storbritannia"
 
-#: 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 "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
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "U.S. Virgin Islands"
 
-#: 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. Virgin Islands"
 
-#: 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 And Futuna Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Western 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 "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 "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"
 
@@ -2530,20 +2564,20 @@ msgstr "TTY/TDD"
 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 "Rediger full"
 
-#: 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 "Fullt namn"
 
-#: 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"
 
@@ -2565,6 +2599,19 @@ msgstr ""
 "%s eksisterar allereide\n"
 "Vil du skrive over?"
 
+#: addressbook/gui/contact-editor/file-exists.glade.h:1
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:2
+msgid "Don't bother translating this string.  It's not used."
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#, fuzzy
+msgid "Overwrite"
+msgstr "Skriv over fil?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -2695,7 +2742,7 @@ msgstr "contact-list-editor"
 msgid "Contact List Editor"
 msgstr "Redigering av kontakter"
 
-#: 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 "Lagre liste som VCard"
 
@@ -2743,7 +2790,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 "Avansert s�k"
 
@@ -2752,27 +2799,27 @@ msgstr "Avansert s�k"
 msgid "Search"
 msgstr "S�k"
 
-#: 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 ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: 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"
@@ -2784,10 +2831,10 @@ msgid "Success"
 msgstr "Vellukka"
 
 #: 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 "Ukjend feil"
 
@@ -2796,7 +2843,7 @@ msgstr "Ukjend feil"
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: 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 "Nekta tilgang"
@@ -2817,8 +2864,8 @@ msgstr "Protokollen er ikkje st�tta"
 #: 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 "Avbroten"
 
@@ -2866,7 +2913,7 @@ msgstr "Feil ved fjerning av liste"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
@@ -2883,9 +2930,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
@@ -2971,7 +3017,7 @@ msgstr "Adressebok"
 
 #: 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 "Lagre som VKort"
@@ -3051,7 +3097,7 @@ msgstr "Kopier"
 msgid "Paste"
 msgstr "Lim inn"
 
-#: 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
@@ -3059,8 +3105,8 @@ msgstr "Lim inn"
 msgid "Delete"
 msgstr "Slett"
 
-#: 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"
@@ -3069,7 +3115,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,�,�,�"
 
@@ -3077,11 +3123,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"
@@ -3205,7 +3251,7 @@ msgid "Include:"
 msgstr "Inkluder:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Liggjande"
 
@@ -3230,7 +3276,7 @@ msgid "Options"
 msgstr "Val"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Retning"
 
@@ -3253,7 +3299,7 @@ msgstr "Papirkjelde:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "St�ande"
 
@@ -3315,20 +3361,20 @@ msgstr "Avtale utan namn"
 
 #: 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�g"
 
 #: 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 "Vanleg"
 
 #: 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"
 
@@ -3339,13 +3385,17 @@ msgstr "Lav"
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: 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 "Feil ved kommunikasjon mot kalendartenaren"
 
-#: 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
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -3465,11 +3515,11 @@ msgstr "L�g grense (minutt):"
 msgid "_Edit appointment"
 msgstr "R_edig�r avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Inga skildring tilgjengeleg"
 
-#: 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"
@@ -3477,13 +3527,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 "�tvaring"
 
-#: 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 "
@@ -3494,17 +3544,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 "Ikkje sp�r igjen"
 
-#: 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 "Kunne ikkje initiere 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 ""
@@ -3558,7 +3608,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 ""
@@ -3632,9 +3682,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
@@ -3651,13 +3701,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 "Nei"
 
@@ -3677,82 +3727,102 @@ msgstr "Vekesvisning"
 msgid "Month View"
 msgstr "M�nadsvising"
 
-#: 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 inneheld avtaler og hendingar"
 
-#: 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 "_Offentleg kalendar-URL:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Mappe inneheld avtaler og hendingar"
+
+#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
+#: calendar/importers/icalendar-importer.c:704
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Oppg�ver"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Mappe inneheld huskeliste"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Skriv ut kort"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Mappe inneheld huskeliste"
+
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Lag ein ny avtale"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Nettverksinnstillingar"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "M�te"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Opprett ei ny oppg�ve"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Ny oppg�ve"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Oppg�ve"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Opprett ei ny oppg�ve"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Lag ein ny avtale"
@@ -3802,27 +3872,27 @@ msgid "Alarm Repeat"
 msgstr "Alarmen repeterar"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid ""
+"Evolution does not yet support email notification for reminders.  You will "
+"not be able to edit the options for this reminder."
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Melding som skal visast"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Spel lyd:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Repeter alarmen"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "K�yr 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 ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Med desse argumenta:"
@@ -3847,110 +3917,110 @@ msgstr "timar"
 msgid "minutes"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
-#: 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 veker"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 veke"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d timar"
 
-#: 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 minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: 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 "Spel ein 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 ei melding"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Send ein e-post"
 
-#: 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�yr eit program"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utf�rast"
 
-#: calendar/gui/dialogs/alarm-page.c:403
+#: calendar/gui/dialogs/alarm-page.c:413
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s f�r byrjing p� avtalen"
 
-#: calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/dialogs/alarm-page.c:416
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter byrjinga p� avtalen"
 
-#: calendar/gui/dialogs/alarm-page.c:411
+#: calendar/gui/dialogs/alarm-page.c:421
 #, fuzzy, c-format
 msgid "%s at the start of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:420
+#: calendar/gui/dialogs/alarm-page.c:430
 #, fuzzy, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:423
+#: calendar/gui/dialogs/alarm-page.c:433
 #, fuzzy, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:428
+#: calendar/gui/dialogs/alarm-page.c:438
 #, fuzzy, c-format
 msgid "%s at the end of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c: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 ""
@@ -3971,7 +4041,7 @@ msgstr "P�minning"
 
 #: 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 "Samandrag:"
 
@@ -4055,7 +4125,7 @@ msgid "Days"
 msgstr "Dagar"
 
 #: 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"
 
@@ -4068,7 +4138,7 @@ msgid "Minutes"
 msgstr "Minutt"
 
 #: 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 "M�ndag"
 
@@ -4078,7 +4148,7 @@ msgid "S_un"
 msgstr "Su_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 "Laurdag"
 
@@ -4091,7 +4161,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis veke_nummer i datonavigat�ren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "S�ndag"
 
@@ -4110,7 +4180,7 @@ msgid "Task List"
 msgstr "_Oppg�veliste"
 
 #: 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"
 
@@ -4127,7 +4197,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 "Tysdag"
 
@@ -4136,7 +4206,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"
 
@@ -4369,8 +4439,8 @@ msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
 #: 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 "Lagre som ..."
 
@@ -4442,28 +4512,28 @@ msgstr "Deleg�r til:"
 msgid "Enter Delegate"
 msgstr "Tast inn 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 "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "P�minning"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: 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 "K�yreplan ..."
 
-#: 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�te"
 
@@ -4532,19 +4602,19 @@ msgstr "_Slutt-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 ""
 
-#: 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 "_Deleg�r til ..."
 
@@ -4584,7 +4654,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 "RSVP"
@@ -4596,7 +4666,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"
@@ -4673,49 +4743,49 @@ 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 "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 "Anna"
 
-#: 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 "Alternativ 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 "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 #, fuzzy
 msgid "on the"
 msgstr "M�nad"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -4813,7 +4883,7 @@ msgstr "Dato ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c: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 "Vel ikon"
@@ -4823,7 +4893,7 @@ msgid "Progress"
 msgstr "Framgang"
 
 #: 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:"
 
@@ -4835,17 +4905,17 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Enkel"
 
-#: 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:"
@@ -4915,12 +4985,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 "Slettar valde objekt"
 
-#: 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 "_Opne"
@@ -4930,30 +5000,30 @@ msgstr "_Opne"
 msgid "_Save as..."
 msgstr "Lagre 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 ut"
 
-#: 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 "Kl_ipp ut"
 
-#: 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 "_Kopier"
 
-#: 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"
@@ -4982,12 +5052,12 @@ msgstr "_Merk oppg�ver som ferdig"
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppg�ver"
 
-#: 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 "Oppdaterar objekt"
 
-#: 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 "Trykk her for � leggje til ei oppg�ve"
@@ -4996,8 +5066,8 @@ msgstr "Trykk her for � leggje til ei oppg�ve"
 msgid "Alarms"
 msgstr "Alarmar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c: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 "Ferdig"
 
@@ -5026,7 +5096,7 @@ msgid "Start Date"
 msgstr "Start-dato"
 
 #: 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 "Samandrag"
@@ -5093,130 +5163,130 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Ny _avtale"
 
-#: 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 h_eildagshending"
 
-#: 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�te"
 
-#: 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 oppg�ve"
 
-#: 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 "Skriv ut ..."
 
-#: 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 idag"
 
-#: 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
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Informasjon"
 
-#: 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 "Set opp %1"
 
-#: 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 "Set opp %1"
 
-#: 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 "_Lagre 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 "K�yreplan ..."
 
-#: 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 "Fort framover"
 
-#: 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 "Se&nd avtale"
 
-#: 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 "Erstatt denne f�rekomsten?"
 
-#: 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 "Slettar klassen"
 
-#: 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 ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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 "Sluttar: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Ferdig "
 
-#: 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 "Informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Skriv ut alle"
 
-#: 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 "Ein ukjent 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."
@@ -5224,340 +5294,352 @@ msgstr ""
 "<br> Sj� gjennom den f�lgjande informasjon, og velj ei handling fr� menyen "
 "under."
 
-#: 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 "_Plassering:"
 
-#: 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 "Akseptert"
 
-#: 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 "Mellombels"
 
-#: 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 "Avsl�tt"
 
-#: 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 "Ukjend"
 
-#: 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 "Vel ei handling:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Oppdater"
 
-#: 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 "Godta"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Mellombels"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Avsl�"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Opdat�r status p� svar"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informasjon"
 
-#: 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 "Avbryt"
 
-#: 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 "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Personleg informasjon"
 
-#: 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> sp�r etter deg for � stille opp p� eit m�te."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "M�teframlegg"
 
-#: 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> �nskjar � leggje til ei eksisterande oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "M�teoppdatering"
 
-#: 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 "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "M�teoppdatering"
 
-#: 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 "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "M�tesvar"
 
-#: 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 "<b>%s</b> har kansellert ei oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "M�tekansellering"
 
-#: 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> har kansellert ei oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "&Finn i melding ..."
 
-#: 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 "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Oppg�veinformasjon"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "Pr�v �%s --help� for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Oppg�veframlegg"
 
-#: 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> �nskjar � leggje til ei eksisterande oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Oppg�veoppdatering"
 
-#: 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 "Dette er ei f�rehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Oppg�veoppdateringsforep�rjing"
 
-#: 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 "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Oppg�vesvar"
 
-#: 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 kansellert ei oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Oppg�vekansellering"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Skriv ut alle"
 
-#: 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 "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Fri/ledig-informasjon"
 
-#: 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 "Pr�v �%s --help� for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Fri/ledig foresp�rsel"
 
-#: 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 "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Fri/Oppteke svar"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Private meldingar"
 
-#: 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 "Meldinga ser ikkje ut til � vere skikkeleg forma"
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Meldinga har ingen sendar"
 
-#: 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 "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 #, fuzzy
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#: 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 "Kunne ikkje lagra adresseboka."
 
-#: 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 ""
+"Kan ikkje fjerna post fr�\n"
+"postboksen '%1':\n"
+"%2"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Ferdig"
 
-#: 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 ""
+"Kan ikkje fjerna post fr�\n"
+"postboksen '%1':\n"
+"%2"
+
+#: 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
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Ferdig"
 
-#: 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 "Dato"
 
-#: 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 "Vel mappe"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vel mappe"
@@ -5604,7 +5686,7 @@ msgstr "start-dato"
 msgid "Chair Persons"
 msgstr "Bil-telefon"
 
-#: 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 "Tenarinformasjon"
@@ -5620,55 +5702,55 @@ msgid "Resources"
 msgstr "Ressurs"
 
 #: 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 "Ressurs"
 
 #: 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 "Rom"
 
 #: 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 "Teikn"
 
 #: 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 "Tenarinformasjon"
 
 #: 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
 #, fuzzy
 msgid "Optional Participant"
 msgstr "Personleg informasjon"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c: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 "Mellombels"
 
 #: 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 "Delegert"
 
@@ -5762,23 +5844,23 @@ msgstr "&Helsingstekst:"
 msgid "Meeting _end time:"
 msgstr "M�t_e slutttid:"
 
-#: 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 "Leitar etter tilleggsmodular"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
-#: calendar/gui/e-tasks.c: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 ""
@@ -5786,22 +5868,31 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: 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 ""
+"Feil ved nedlasting av fil:\n"
+"%1"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Fullf�ringsdato"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "Forventar %1"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
@@ -5818,7 +5909,13 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
-#: 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 p� %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5826,7 +5923,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"
@@ -5834,12 +5931,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 "Feil ved opning"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Leitar etter tilleggsmodular"
@@ -5900,53 +5997,63 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: 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 "Informasjon"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Informasjon om oppg�ve"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 msgid "Calendar information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Frisk opp liste"
 
-#: 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 "Informasjon"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "Informasjon"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6186,7 +6293,7 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalendar"
 
 #: 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 "F�rehandsvising av utskrift"
@@ -6209,7 +6316,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: 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 +6324,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 "Ikkje sp�r igjen"
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Skriv ut kort"
@@ -6284,17 +6391,17 @@ msgstr "Mottek meldingar fr� %1"
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "P�minning"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendermelding"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6303,115 +6410,120 @@ msgstr ""
 "Evolution har funne Pine e-postfiler.\n"
 "Vil du importere desse inn i 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 ""
 
-#: 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 "Anna feil"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8022,88 +8134,88 @@ msgstr "Lagrar mappe �%s�"
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Synkroniserar 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
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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 ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hentar melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Kan ikkje opne melding"
 
-#: 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 "Kunne ikkje leggja til melding:\n"
 
-#: 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 "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Klarte ikkje � dekode melding."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldig(e) argument"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldig(e) argument"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-search.c:547
+#: camel/camel-filter-search.c:550
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-search.c: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 ""
@@ -8156,11 +8268,11 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Flyttar melding"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Melding"
@@ -8478,7 +8590,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 ""
 
@@ -8536,50 +8648,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 "URLen �%s� treng ein bruknamn-komponent"
 
-#: 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 "Sl�r opp: %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 "Feil i namneoppslag: %s"
 
-#: 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 "Sl�r opp addresse"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 msgid "Host lookup failed: host not found"
 msgstr "Namneoppslag feila: vert ikkje funnen"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 msgid "Host lookup failed: unknown reason"
 msgstr "Namneoppslag feila: ukjend grunn"
 
@@ -8779,7 +8891,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"
@@ -8788,11 +8900,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 +8926,7 @@ msgstr ""
 "Vil du akseptere likevel?"
 
 #. 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"
@@ -8871,70 +8983,78 @@ msgstr "Leitar etter tilleggsmodular"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
 
-#: 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 "Operasjonen vart avbroten"
 
-#: 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 "Unexpected response from IMAP server: %s"
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
 msgstr "Slett e-post fr� tenaren"
 
 #: camel/providers/imap/camel-imap-command.c:395
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "Slett e-post fr� tenaren"
+
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feila: %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 ""
 
-#: 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 ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Leitar etter endra meldingar"
 
-#: 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 "Klarte ikkje � dekode melding."
 
-#: 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
@@ -8946,31 +9066,28 @@ msgstr "Klarte ikkje � dekode melding."
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
-msgstr "Klarar ikkje � hente melding: %s\n"
+msgstr ""
+"Klarar ikkje � hente melding: %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 slik melding"
 
-#: 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 meldinga er ikkje tilgjengeleg."
 
-#: 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 "Leiter etter nye meldingar"
-
-#: 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 ""
 
@@ -8989,6 +9106,11 @@ msgstr ""
 msgid "Failed to cache message %s: %s"
 msgstr "Kunne ikkje leggja til melding:\n"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Kunne ikkje leggja til melding:\n"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Ser etter ny e-post"
@@ -9036,74 +9158,69 @@ msgstr "Passord"
 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 "IMAP-tenar %s"
 
-#: 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 "IMAP-teneste 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 "Tilknytning avbroten"
 
-#: 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 "Klarte ikkje � kople 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 ikkje lasta kalender '%1'.\n"
 
-#: 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 "Operasjonen vart stoppa"
 
-#: 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 forhandlinga feila"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, c-format
-msgid "The folder %s no longer exists"
-msgstr "Mappa %s eksisterar ikkje lengre"
-
-#: 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-tenaren %s s�ttar ikkje den �nska autentiseringstypa %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
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: 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 "Du tasta ikkje inn eit passord."
 
-#: 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"
@@ -9113,13 +9230,13 @@ msgstr ""
 "Ikkje i stand til � autentisere mot IMAP-tenar.\n"
 "%s\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 "Vidaresendt melding"
 
-#: 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\""
@@ -9127,12 +9244,12 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: 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 "Ukjend feil"
 
-#: 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 ""
 
@@ -9213,8 +9330,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 ""
@@ -9226,7 +9343,7 @@ msgstr "er ei vanleg fil"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
@@ -9242,7 +9359,7 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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 ""
@@ -9250,12 +9367,12 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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 ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
@@ -9263,17 +9380,17 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
 
@@ -9294,6 +9411,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
 #, fuzzy, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9306,12 +9424,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 "Mappa �%s� eksisterar ikkje."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, fuzzy, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9335,7 +9455,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
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -9368,7 +9489,7 @@ msgid "Storing folder"
 msgstr "Lagrar 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
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Leitar etter tilleggsmodular"
@@ -9546,43 +9667,48 @@ msgstr "�%s� er ikkje ein katalog"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikkje opna katalogen %1"
 
-#: 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 "Denne mappa kan ikkje fjernast."
 
-#: 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 "er ei vanleg fil"
 
-#: 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 "Fila finst ikkje\n"
 
-#: 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 ikkje ei vanleg 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
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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 "Denne mappa kan ikkje fjernast."
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Denne mappa kan ikkje fjernast."
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Denne mappa kan ikkje slettast."
@@ -9678,50 +9804,50 @@ msgstr "Avbryt"
 msgid "Operation failed: %s"
 msgstr "Operasjonen vart avbroten"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Mottek meldingar fr� %1"
 
-#: 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 "Operasjonen vart avbroten"
 
-#: 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 "Leitar etter tilleggsmodular"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Sentrer dei valte elementa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og sl� saman"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: 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 ikkje setja blokkstorleik for band."
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Kjende program"
@@ -9986,43 +10112,43 @@ msgstr "Autentisering:"
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Feil svar p� 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Meldinga ser ikkje ut til � vere skikkeleg forma"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Feil svar p� 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 "Autentisering:"
 
-#: 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 "Oppgi ditt OpenPGP-passord"
 
-#: 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"
@@ -10030,94 +10156,94 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tenar %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 ""
 
-#: 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 "Sen melding"
 
-#: 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 "Meldinga har ingen sendar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "M�te"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Feil svar p� RSET: %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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
@@ -10125,81 +10251,72 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "Feil svar p� 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
 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 "Feil svar p� 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Feil svar p� 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 oktettar"
-
-#: 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 "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet fr� lista"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
@@ -10233,7 +10350,7 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -10245,46 +10362,46 @@ msgstr "Legg adresse til adresseboka"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c: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 "Fr�:"
 
 #.
 #. * 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
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn p� meldinga."
 
-#: 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."
@@ -10293,12 +10410,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 "Ingen skildring"
@@ -10313,7 +10430,7 @@ msgstr "Legg ved fil"
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10322,53 +10439,53 @@ msgstr ""
 "Feil ved lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "�tvaring:"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Fila eksisterar, skriv over?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10377,60 +10494,80 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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 ""
+"Dette er siste trekk.\n"
+"Vil du leggja til fleire trekk?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "�tvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Lagre 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 ei melding"
 
-#: 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 "Kan ikkje laga nytt vindauge.\n"
+
+#: composer/e-msg-composer.c:2879
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/e-msg-composer.c: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 "Klarar ikkje � starte Evolution-komponisten."
 
 #: data/evolution.desktop.in.h:1
@@ -10481,8 +10618,8 @@ msgstr "Emne inneheld"
 msgid "Subject does not contain"
 msgstr "Emne inneheld ikkje"
 
-#: 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?"
@@ -10631,7 +10768,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 gl�ymt � velje ein dato."
 
 #: filter/filter-datespec.c:269
@@ -10690,13 +10828,12 @@ msgid "Add action"
 msgstr "Legg til 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 ""
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Stilnamn:"
 
-#: 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 "Vel mappe"
 
@@ -10709,7 +10846,7 @@ msgstr ""
 "Feil ved lesing av fil:\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 "Viktig"
@@ -10890,226 +11027,230 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "inneheld"
-
-#: 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 motteke"
 
-#: 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 "Sletta"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "inneheld ikkje"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "sluttar ikkje med"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "finst ikkje"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "finst ikkje"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "h�yres ikkje ut som"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "startar ikkje med"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Eksisterar ikkje"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Kladd"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "sluttar med"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Eksisterar"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "eksisterar"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: 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 etter"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "var f�r"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "er flagga"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "er st�rre enn"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "er mindre enn"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "er ikkje"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "er ikkje flagga"
-
-#: 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 "E-postliste"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Meldingshovud"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Send melding til kontakt"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spel 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 "Les"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Mottakarar"
 
-#: 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 "Svart 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 enn"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "er mindre enn"
+#: 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 "Poengsum"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Avsendar"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Sett 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 "Storleik (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "h�yres ut som"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "byrjar med"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: 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 "Sett status"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "inneheld"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "inneheld ikkje"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "sluttar ikkje med"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "finst ikkje"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "finst ikkje"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "h�yres ikkje ut som"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "startar ikkje med"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "sluttar med"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "eksisterar"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "er flagga"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "var etter"
+
+#: 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 enn"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "er mindre enn"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "er ikkje flagga"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "er ikkje"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "er st�rre enn"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "er mindre enn"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "h�yres ut som"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "byrjar med"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Linjer"
@@ -11144,31 +11285,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 "Importerar ..."
 
-#: 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 "Venlegast 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 "Importerar %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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Sender %1"
 
-#: 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 "E-post"
 
@@ -11225,42 +11366,42 @@ 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 "Papirkorg"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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 "Leitar etter tilleggsmodular"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Startar importering"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Rediger 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?"
@@ -11383,28 +11524,38 @@ msgid "Folder containing mail"
 msgstr "Fil alt i liste"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Offentleg"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Fil alt i liste"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Virtuell papirkorg"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Mapper"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikkje innehalde meldingar."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Endra namnet p� spelarane"
 
-#: 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."
@@ -11412,80 +11563,81 @@ msgstr ""
 "Nokre av e-postinstillingane dine ser ut til � vere �ydelagde, sjekk 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 ikkje sett opp ein 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 "�tvaring: Melding er endra"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: 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 "Skriv ei melding"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Ny melding"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Forrige melding"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Ny e-postmelding"
 
-#: 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 "Klarar ikkje initialisere Evolution sin e-postkomponent"
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr " Koplar til tenar ..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Klarar ikkje � registrer lager med skal"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar for �%s�"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Eigenskapar"
 
-#: 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 "Klarte ikkje � lage mellombels katalog: %s"
@@ -11530,142 +11682,142 @@ msgstr "%d sendt"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "vMappe p� _emne"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "vMappe p� avse_dar"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "vMappe p� mottaka_r"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "vMappe p� e-post_liste"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� _emne"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� avsen_dar:"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: 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 "Fil alt i liste"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: 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 avsendar"
 
-#: 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 _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 "Svar til _alle"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: 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 "Ferdig"
 
-#: 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_ker som lesen"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marker som uvi_ktig"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Flytt 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 "_Kopier til mappe ..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsendar i adresseboka"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Bruk filter"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r p� e-postliste (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Fil alt i liste"
@@ -11741,20 +11893,20 @@ msgstr "Du har ikkje fyllt ut all den p�krevde informasjonen."
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: 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 "_Vert:"
 
-#: 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_ukarnamn:"
 
-#: 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 "_Sti:"
 
-#: 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 ikkje opprette to kontoar med det same namnet."
 
@@ -11772,14 +11924,14 @@ msgid "Really delete account?"
 msgstr "Verkeleg slette 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 "Skru av"
 
 #: 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 "Skru p�"
 
@@ -11865,9 +12017,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 ei HTML-formattert melding, men den f�lgjande mottakeren vil ikkje "
 "ha HTML-formatter e-post:\n"
@@ -11909,82 +12062,82 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Du m� spesifisere mottakarar for � sende denne meldinga."
 
-#: 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 "ein ukjend avsendar"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "P� %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: 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 "Er du sikker p� at du vil sletta %1?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil fjerna %1?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Ingen meldingar vald!"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Skriv over fil?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Lagre melding som ..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Lagre meldingar som ..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Vis informasjonsmelding"
 
-#: 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"
@@ -11992,71 +12145,71 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: 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 "Utskrift av melding feila"
 
-#: 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 "Er du sikker p� at du vil sletta denne overf�ringa?"
 
-#: 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 "Ingen skildring"
 
-#: 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 utan namn"
 
-#: 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 "Legg til kriterium"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Lagre signatur"
@@ -12099,16 +12252,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#: 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 "Sjekkar teneste"
 
-#: 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 " Koplar til tenar ..."
@@ -12832,80 +12985,76 @@ msgstr "Kunne ikkje laga kio-jobb.\n"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Klarte ikkje � lage mellombels katalog: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Vis innvevd"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Opne i %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 "G�ym"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Ekstern visar"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Last b_ileter"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d. %b %k:%M"
 
-#: 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 "Opna ved innsetjing"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenkje som "
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Lagre  bilete som ..."
 
@@ -12914,148 +13063,144 @@ msgstr "Lagre  bilete som ..."
 msgid "Pinging %s"
 msgstr "Sender %1"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: 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 "Dato"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Ugyldig addresse"
 
-#: 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 "Fr�"
 
-#: 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 "E-post"
 
-#: 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 "Kunne ikkje laga kio-jobb.\n"
 
-#: 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 "Lokale mapper"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Les mapper"
 
-#: 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 "Klarar ikkje � lagre mappemetainfo til %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Klarar ikkje � lagre mappemetainfo til %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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
-#, fuzzy
-msgid "You cannot change the format of a non-local folder."
-msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Set opp %1"
 
+#: mail/mail-local.c:1510
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13295,21 +13440,21 @@ msgstr "Ventar ..."
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppf�ringa"
 
-#: 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 "Tast inn passord for %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
@@ -13318,11 +13463,11 @@ msgstr "Tast inn passord"
 msgid "Could not save signature file: %s"
 msgstr "Klarte ikkje � lagre signaturfil."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Lagre signatur"
 
-#: 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"
@@ -13332,11 +13477,11 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: 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 "Namn:"
 
@@ -13372,7 +13517,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 "vMapper"
 
@@ -13402,68 +13547,68 @@ msgstr "(Ikkje noko emne)"
 msgid "%s - Message"
 msgstr "%s - melding"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "H�gare"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "H�gast"
 
-#: 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
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %k:%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 "Opprettar meldingsliste"
 
@@ -13538,44 +13683,70 @@ msgstr "Svar til alle"
 msgid "Review"
 msgstr "F�rehandsvisning"
 
-#: 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 "Ferdig"
+
+#: 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 "Ferdig"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Flagga"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Leitar gjennom 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 "Leitar gjennom rotniv�-mapper p� �%s�"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abbonerar p� mappe �%s�"
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjernar 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
 msgid "Scanning folders..."
 msgstr "Leiter gjennom mapper ..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Ingen tenar har vorte vald"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Velj ein tenar"
 
@@ -23481,12 +23652,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Ingen skildring"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Postsamandrag"
 
-#: 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"
 
@@ -23496,23 +23667,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 "ENOV:ENGM"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictinary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Legg til ei nyhendekjelde"
 
-#: 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 "Oppgi URLen p� den nyhendekjelda du vil leggje til"
 
@@ -23552,11 +23723,11 @@ msgstr "(Ingen skildring)"
 msgid "My Weather"
 msgstr "Mitt v�r"
 
-#: 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 "V�r"
 
@@ -24997,6 +25168,11 @@ msgid ""
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Opne i %s ..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25215,12 +25391,23 @@ msgid "Rename folder"
 msgstr "Endra namn p� profil '%1'"
 
 #: 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 "Arkivfilnamnet er ikkje gyldig.\n"
 
-#: 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 ikkje lasta kalender '%1'.\n"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25229,12 +25416,12 @@ msgstr ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Lag _ny mappe ..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Ny ..."
 
@@ -25259,17 +25446,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Vel informasjonen du vil 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 ""
-
-#: 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"
@@ -25278,33 +25455,33 @@ msgstr ""
 "Importerar %s\n"
 "Importerar element %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Vel mappe"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fila %s finst ikkje"
 
-#: 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 feil"
 
-#: 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 "Det er ikkje band i stasjonen."
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25313,74 +25490,74 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil ved asting av %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
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Vel ei 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 "Import�r data og innstillinga fr� eldre program"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 #, fuzzy
 msgid "Import a single file"
 msgstr "Flyttar"
 
-#: 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 "Fr� %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: 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 "Import�r"
 
@@ -25409,32 +25586,32 @@ msgstr "Synkroniser mapper"
 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 "Leitar etter tilleggsmodular"
 
-#: 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 "Leitar etter tilleggsmodular"
 
-#: 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 "Opne 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 ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
@@ -25482,49 +25659,49 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr "�.� og �..� er resverte mappenamn."
 
-#: 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 vart ikkje funnen i s�kestien din ($PATH)"
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Oppl�ysing"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 #, fuzzy
 msgid "Select the folder that you want to open"
 msgstr "Vel det ikontemaet du vil bruka:"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel katalogen som inneheld tenestene"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: 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 "Arbeid _fr�kopla"
 
-#: 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 "Arbeid fr�kopla"
 
@@ -25532,25 +25709,25 @@ msgstr "Arbeid fr�kopla"
 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 ""
 
-#: 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 ""
@@ -25563,12 +25740,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, fuzzy, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25576,20 +25753,20 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Ugyldig(e) argument"
 
-#: 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 "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Generell feil"
 
@@ -25738,68 +25915,72 @@ msgstr "Snarvegar"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip � senda."
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Mappa er ikkje tom"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje st�tta p� tenar"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Leitar etter tilleggsmodular"
 
+#: 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 (...)"
@@ -26009,7 +26190,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 ""
@@ -26025,29 +26206,24 @@ msgstr "KDeelop-installering"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Assistant"
-msgstr "KDeelop-installering"
-
-#: shell/importer/import.glade.h:4
-#, fuzzy
 msgid "Import File (step 3 of 3)"
 msgstr "Signaturfil:"
 
-#: 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 "Signaturfil:"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 #, fuzzy
 msgid "Select a File (step 2 of 3)"
 msgstr "Signaturfil:"
 
-#: 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"
@@ -26272,10 +26448,10 @@ msgstr "tid no"
 #: 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_andlingar"
 
@@ -26402,7 +26578,7 @@ msgid "Print this item"
 msgstr "Skriv ut dette elementet"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Lagre"
 
@@ -26429,7 +26605,7 @@ msgstr "Lagre dette elementet til disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Fil"
 
@@ -26522,7 +26698,7 @@ msgstr "K�yreplan ..."
 
 #: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
-msgid "Customise My Evolution"
+msgid "Customize My Evolution"
 msgstr "Evalueringsfeil"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26574,32 +26750,32 @@ msgid "Post a message to a Public folder"
 msgstr "Mottek meldingar fr� %1"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Leitar etter tilleggsmodular"
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Vis meldings-f�rehandsvisningsvindauge"
 
-#: 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 "Mapper"
 
-#: 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
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "F�rehandsvis i"
 
-#: ui/evolution-mail-global.xml.h:19
-#, fuzzy
-msgid "_Subscribe to Folders..."
-msgstr "Leitar etter tilleggsmodular"
-
 #: ui/evolution-mail-list.xml.h:1
 #, fuzzy
 msgid "Change the properties of this folder"
@@ -26696,7 +26872,7 @@ msgstr "Tr�da meldingsliste"
 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 "_Mappe"
 
@@ -27025,7 +27201,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen p� ruta her."
 
 #: 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 "Endre sideoppsett for aktiv skrivar"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -27138,7 +27315,7 @@ msgstr "_Sitert"
 msgid "_Resend..."
 msgstr "_Omd�yp ..."
 
-#: 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 "Verk_ty"
 
@@ -27154,12 +27331,12 @@ msgstr "Lukk vindauge"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "L_ukk"
 
 #: 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 "_Visning"
 
@@ -27331,7 +27508,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Lagre aktiv fil"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -27494,7 +27671,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Lag _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
@@ -27510,110 +27687,131 @@ msgid "Pi_lot Settings..."
 msgstr "Pi_lot-innstillingar ..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "_Pilot-innstillingar"
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Lag _ny mappe ..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Send / Motta"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Send queued items and retrieve new items"
 msgstr "Send k�a meldingar og motta ny meldingar"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Oppsett for pilot"
+
+#: ui/evolution.xml.h:32
 msgid "Set up Pilot configuration"
 msgstr "Oppsett for pilot"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn ei feilmelding ved hjelp av Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Byt"
 
-#: 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 "Avgjer om snarvegstolpen skal vise"
 
-#: 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 "Vis den valde mappa"
 
-#: 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 "_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 "_Mappestolpe"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 msgid "_Folder..."
 msgstr "_Mappe ..."
 
-#: 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 "_Flytt ..."
 
-#: 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
-msgid "_Preferences..."
-msgstr "_Innstillingar ..."
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Remove Other User's Folder"
+msgstr "Lag _ny mappe ..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Omd�yp ..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Sende / Motta"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Innstillingar for e-post ..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Snarvegstolpe"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 msgid "_Shortcut..."
 msgstr "_Snarveg ..."
 
@@ -27841,11 +28039,11 @@ msgstr "Teiknkoding"
 msgid "..."
 msgstr "... "
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Redigering av s�k"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Lagre s�k"
 
@@ -27920,6 +28118,31 @@ msgstr "init_corba(): klarte ikkje initialisere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 
+#~ msgid "&lt;- _Remove"
+#~ msgstr "&lt;- Fje_rn"
+
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Legg til -&gt;"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Leiter etter nye meldingar"
+
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Mappa %s eksisterar ikkje lengre"
+
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u oktettar"
+
+#, fuzzy
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "KDeelop-installering"
+
+#~ msgid "_Preferences..."
+#~ msgstr "_Innstillingar ..."
+
 #~ msgid "Error in search expression."
 #~ msgstr "Feil i s�keuttrykk."
 
@@ -28399,9 +28622,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_Oppg�ve ..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Innstillingar for e-post ..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Vidaresend som _vedlegg"
 
diff --git a/po/no.po b/po/no.po
index 49cb2383da..03105f1cb2 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-10-05 10:12+0200\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-10-05 11:00+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -3075,7 +3075,7 @@ msgstr "Kopier"
 msgid "Paste"
 msgstr "Lim inn"
 
-#: 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
@@ -3487,11 +3487,11 @@ msgstr "Utsett-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_ediger avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: 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"
@@ -3503,13 +3503,13 @@ msgstr ""
 "� sende e-post. Evolution vil vise en vanlig dialog\n"
 "for p�minnelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: 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
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3526,7 +3526,7 @@ msgstr ""
 "\n"
 "Er du sikker p� at du �nsker � kj�re dette programmet?"
 
-#: 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 "Ikke sp�r meg om dette programmet igjen."
 
@@ -3725,7 +3725,7 @@ msgstr "Offentlig kalender"
 msgid "Public folder containing appointments and events"
 msgstr "Offentlig mappe som inneholder avtaler og hendelser"
 
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:703
+#: 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
@@ -3835,7 +3835,9 @@ msgstr "Gjentagelse av alarm"
 msgid ""
 "Evolution does not yet support email notification for reminders.  You will "
 "not be able to edit the options for this reminder."
-msgstr "Evolution st�tter ikke e-postmelding for p�minnelser enn�. Du vil ikke kunne redigere alternativene for denne p�minnelsen."
+msgstr ""
+"Evolution st�tter ikke e-postmelding for p�minnelser enn�. Du vil ikke kunne "
+"redigere alternativene for denne p�minnelsen."
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
@@ -4608,7 +4610,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:59
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -5714,36 +5716,43 @@ msgstr "Tid for m�tets _start:"
 msgid "Meeting _end time:"
 msgstr "Tid for m�tets slutt:"
 
-#: 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 "�pner oppgaver p� %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 laste oppgavene 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 "Metoden som er n�dvendig for � laste �%s� er ikke st�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
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har ikke rettigheter til � �pne mappen i �%s�"
 
-#: calendar/gui/e-tasks.c:521
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Feil ved lagring av �%s�: %s"
+
+#: calendar/gui/e-tasks.c:540
 msgid "Completing tasks..."
 msgstr "Fullf�rer oppgaver..."
 
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:563
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:637
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "T�mmer"
 
@@ -5767,7 +5776,7 @@ msgstr "Metoden som er n�dvendig for � �pne �%s� er ikke st�ttet"
 msgid "Adding alarms for %s"
 msgstr "Legger til alarmer for %s"
 
-#: calendar/gui/gnome-cal.c:1745
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5775,7 +5784,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"
@@ -5783,12 +5792,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 "�pner kalender p� %s"
 
-#: calendar/gui/gnome-cal.c:2009
+#: calendar/gui/gnome-cal.c:2029
 msgid "Opening default tasks folder"
 msgstr "�pner forvalgt oppgavemappe"
 
@@ -8596,7 +8605,9 @@ msgstr "Kan ikke dekryptere sertifikatets signatur"
 
 #: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Kan ikke dekryptere signaturen for listen over sertifikater som er trukket tilbake"
+msgstr ""
+"Kan ikke dekryptere signaturen for listen over sertifikater som er trukket "
+"tilbake"
 
 #: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decode issuer's public key"
@@ -8608,7 +8619,8 @@ msgstr "Feil med sertifikatsignatur"
 
 #: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate Revocation List signature failure"
-msgstr "Feil ved signaturen til listen over sertifikater som er trukket tilbake"
+msgstr ""
+"Feil ved signaturen til listen over sertifikater som er trukket tilbake"
 
 #: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate not yet valid"
@@ -8987,7 +8999,7 @@ msgstr "Tilkobling avbrutt"
 
 #: 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"
@@ -9014,7 +9026,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tjener %s st�tter ikke etterspurt autentiseringstype %s"
 
 #: camel/providers/imap/camel-imap-store.c:1097
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen st�tte for autentiseringstype %s"
@@ -9025,7 +9037,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
 #: camel/providers/imap/camel-imap-store.c:1136
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
@@ -9891,40 +9903,40 @@ msgstr "Midlertidig autentiseringsfeil"
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "Welcome response error"
 msgstr "Feil i velkommen-svar"
 
-#: 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 "Kunne ikke koble til SMTP-tjener %s i sikker modus: %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 "tjeneren ser ikke ut til � st�tte 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 "Tidsavbrudd for STARTTLS-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 msgid "STARTTLS response error"
 msgstr "Feil i STARTTLS-svar"
 
-#: 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-tjener %s st�tter ikke etterspurt autentiseringstype %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 "%sVennligst skriv inn SMTP-passord 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"
@@ -9935,87 +9947,87 @@ 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-tjener %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 melding: senderadresse 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 melding"
 
-#: 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 melding: ingen mottakere definert."
 
-#: 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 "Kan ikke sende melding: en eller flere ugyldige mottakere"
 
-#: 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
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Tidsavbrudd for HELO-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr "Feil i HELO-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Feil under oppretting av SASL-autentiseringsobjekt."
 
-#: 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 "Tidsavbrudd for AUTH-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH-foresp�rsel feilet."
 
-#: 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� autentisering fra tjener.\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 "Tidsavbrudd for �MAIL FROM�-foresp�rsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Feil i �MAIL FROM�-svar"
 
-#: 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 "Tidsavbrudd for �RCPT TO�-foresp�rsel: %s: melding 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 "RCPT TO <%s> feilet"
 
-#: 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 "Tidsavbrudd for DATA-foresp�rsel: %s: melding ikke sendt."
@@ -10023,36 +10035,36 @@ msgstr "Tidsavbrudd for DATA-foresp�rsel: %s: melding ikke sendt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr "Feil i DATA-svar"
 
-#: 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 ""
 "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "Feil i DATA-termineringssvar"
 
-#: 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 "Tidsavbrudd for RSET-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "Feil i RSET-svar"
 
-#: 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 "Tidsavbrudd for QUIT-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "Feil i QUIT-svar"
 
@@ -10391,7 +10403,7 @@ msgstr "Emne inneholder"
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: e-util/e-dialog-utils.c:241 mail/mail-callbacks.c:2536
+#: 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"
@@ -10610,7 +10622,7 @@ msgstr ""
 "Feil i regul�rt uttrykk �%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 "Viktig"
@@ -10787,219 +10799,219 @@ msgid "Beep"
 msgstr "Pip"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "inneholder"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: 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 "inneholder ikke"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "returnerer ikke"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ligner ikke"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:19
+#: 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 "Skisse"
 
-#: 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 "Uttrykk"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr "F�lg opp"
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "er etter"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "er f�r"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "er merket"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "er st�rre enn"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "er mindre enn"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "er ikke merket"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1757
+#: 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 "E-postliste"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 msgid "Pipe Message to Shell Command"
 msgstr "Kj�r melding gjennom en skall-kommando"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 msgid "Play Sound"
 msgstr "Spill 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 "Les"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Treff p� vanlig uttrykk"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Svart til"
 
-#: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr "returnerer"
-
-#: filter/libfilter-i18n.h:47
-msgid "returns greater than"
-msgstr "returnerer st�rre enn"
-
-#: filter/libfilter-i18n.h:48
-msgid "returns less than"
-msgstr "returnerer mindre enn"
-
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:29
 msgid "Run Once"
 msgstr "Kj�r en gang"
 
-#: 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 "Gi poeng"
 
-#: filter/libfilter-i18n.h:51 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Avsender"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:33
 msgid "Shell Command"
 msgstr "Skall-kommando"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "St�rrelse (kB)"
 
-#: filter/libfilter-i18n.h:55
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:58
-msgid "starts with"
-msgstr "starter med"
-
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: 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 "Emne"
 
-#: filter/libfilter-i18n.h:62
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Nullstill status"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "inneholder"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "inneholder 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
+msgid "does not return"
+msgstr "returnerer 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
+msgid "is Flagged"
+msgstr "er merket"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "er etter"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "er f�r"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "er st�rre enn"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "er mindre enn"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "er ikke merket"
+
+#: 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
+msgid "returns greater than"
+msgstr "returnerer st�rre enn"
+
+#: filter/libfilter-i18n.h:59
+msgid "returns less than"
+msgstr "returnerer mindre enn"
+
+#: filter/libfilter-i18n.h:60
+msgid "returns"
+msgstr "returnerer"
+
+#: 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"
@@ -24965,20 +24977,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du �nsker � 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 nytt fors�k."
-
-#: 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"
@@ -24987,21 +24986,21 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppf�ring %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 msgid "Select importer"
 msgstr "Velg importerer"
 
-#: 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 feil"
 
-#: 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"
@@ -25010,11 +25009,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"
@@ -25023,17 +25022,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 "Feil under start av %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25042,31 +25041,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppf�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 "Velg 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 innstillinger 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"
@@ -25074,24 +25073,24 @@ msgstr ""
 "Vennligst vent...\n"
 "S�ker etter eksisterende oppsett"
 
-#: 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 import"
 
-#: 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 "Velg mappe"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Velg en m�lmappe for � 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 "Importer"
 
@@ -27545,6 +27544,15 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 
+#~ 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 nytt fors�k."
+
 #~ msgid "Scanning for new messages"
 #~ msgstr "S�ker etter nye meldinger"
 
diff --git a/po/pl.po b/po/pl.po
index da3ed2eea5..747d6dcd6a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-09-19 21:12+0200\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-09-24 01:06+0200\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Factory to import LDIF files into Evolution."
 msgstr "Generator importu plik�w z LDIF do Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
 msgid "Imports LDIF files into Evolution."
 msgstr "Importuje pliki LDIF do Evolution."
 
@@ -29,388 +29,388 @@ msgstr "Importuje pliki LDIF do Evolution."
 msgid "Factory to import VCard files into Evolution."
 msgstr "Generator importu plik�w VCard do Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
 msgid "Imports VCard files into Evolution."
 msgstr "Importuje pliki VCard do Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "File As"
 msgstr "Nazwa karty"
 
-#: addressbook/backend/ebook/e-card-simple.c:1 mail/mail-config.glade.h:1
-#: my-evolution/e-summary-table.c:1
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nazwa"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "Primary"
 msgstr "G��wny"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "G�wn"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/widgets/e-addressbook-view.c:390
 msgid "Assistant"
 msgstr "Asystent"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1804
 msgid "Business"
 msgstr "Praca"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Prc"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Callback"
 msgstr "Telefon kontaktowy"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "Frma"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Home"
 msgstr "Dom"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Organization"
 msgstr "Organizacja"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Mobile"
 msgstr "Przeno�ny"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Car"
 msgstr "Samoch�d"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Business Fax"
 msgstr "Faks s�u�bowy"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Faks s�u�b"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 msgid "Home Fax"
 msgstr "Faks w domu"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Business 2"
 msgstr "Praca 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Prc 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Home 2"
 msgstr "Dom 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/widgets/e-addressbook-view.c:374
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Other"
 msgstr "Inne"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/widgets/e-addressbook-view.c:376
 msgid "Other Fax"
 msgstr "Inny faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.c:377
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/widgets/e-addressbook-view.c:379
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:380
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
+#: addressbook/gui/widgets/e-addressbook-view.c:382
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1780
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:384
 msgid "Web Site"
 msgstr "Serwis WWW"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:385
 msgid "Department"
 msgstr "Oddzia�"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Oddz"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:386
 msgid "Office"
 msgstr "Biuro"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Bro"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:387
 msgid "Title"
 msgstr "Tytu�"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:388
 msgid "Profession"
 msgstr "Zaw�d"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Zawd"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:389
 msgid "Manager"
 msgstr "Menad�er"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Mnd�"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Asyst"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:391
 msgid "Nickname"
 msgstr "Przydomek"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Przyd"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:392
 msgid "Spouse"
 msgstr "Ma��onek"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:393
 msgid "Note"
 msgstr "Notka"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "URI kalendarza"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "URIKal"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 msgid "Free-busy URL"
 msgstr "URL sygnalizuj�cy zaj�to��"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "UrlZaj"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Rocznica"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Roczn"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Data urodzenia"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:104
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorie"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Nazwisko panie�skie"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-destination.c:1
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Lista kontakt�w bez nazwy"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Plik VCard z wieloma pozycjami"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "Plik VCard z pozycj� %s"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:1
-#: addressbook/backend/ebook/load-pine-addressbook.c:1
-#: addressbook/backend/ebook/test-client-list.c:1
-#: addressbook/backend/ebook/test-client.c:1
-#: addressbook/conduit/address-conduit.c:1
-#: addressbook/gui/component/addressbook-factory.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
-#: tools/evolution-addressbook-abuse.c:1
-#: tools/evolution-addressbook-export.c:1
-#: tools/evolution-addressbook-import.c:1
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:34
+#: addressbook/conduit/address-conduit.c:1860
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1807
+#: calendar/conduits/todo/todo-conduit.c:1385
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
+#: tools/evolution-addressbook-abuse.c:132
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Nie mo�na zainicjowa� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:1
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
-#: addressbook/backend/pas/pas-backend-file.c:1
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 msgid "Reconnecting to LDAP server..."
 msgstr "Ponowne nawi�zywanie po��czenia z serwerem LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Dodawanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Usuwanie karty z serwera LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "Modyfikowanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Pobieranie wynik�w wyszukiwania na LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr "B��d przy wykonywaniu wyszukiwania"
 
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:293
 msgid "Default Sync Address:"
 msgstr "Domy�lny adres do synchronizacji::"
 
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Nie mo�na wczyta� kursora\n"
 
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "Nie mo�na wczyta� EBook\n"
 
-#: addressbook/conduit/address-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: addressbook/conduit/address-conduit.c:1354
+#: calendar/conduits/calendar/calendar-conduit.c:1278
+#: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "Nie mo�na uruchomi� serwera wombat"
 
-#: addressbook/conduit/address-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: addressbook/conduit/address-conduit.c:1355
+#: calendar/conduits/calendar/calendar-conduit.c:1279
+#: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Nie mo�na uruchomi� wombata"
 
-#: addressbook/conduit/address-conduit.c:1
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
 msgid "Could not read pilot's Address application block"
 msgstr "Nie mo�na odczyta� bloku aplikacji adresowej pilota"
 
@@ -418,152 +418,162 @@ msgstr "Nie mo�na odczyta� bloku aplikacji adresowej pilota"
 msgid "A Bonobo control for an address popup."
 msgstr "Komponent Bonobo wyskakuj�cego okna z adresem."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
 msgid "A Bonobo control for displaying an address."
 msgstr "Komponent Bonobo wy�wietlaj�cy adres."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Przyk�adowy komponent Bonobo wy�wietlaj�cy ksi��k� adresow�."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "Komponent Bonobo wy�wietlaj�cy miniaturow� kart� ksi��ki adresowej Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution obs�uguj�cy kontakty."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Generator komponent�w miniatorowych kart ksi��ki adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Generator komponent�w wy�wietlaj�cych adres z ksi��ki adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 "Generator komponent�w wy�wietlaj�cych wyskakuj�ce okno z adresem z ksi��ki "
 "adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "Factory for the sample Addressbook control"
 msgstr "Generator przyk�adowych komponent�w ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook-component.c:1
-#: addressbook/gui/component/addressbook-component.c:1
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: importers/netscape-importer.c:1 shell/e-local-storage.c:1
-#: shell/e-shortcuts.c:1
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:611
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Folder zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Serwer LDAP zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Folder zawieraj�cy informacje o kontaktach"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Create a new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Nowa lista kontakt�w"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "Lista _kontakt�w"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:572
 msgid "Create a new contact list"
 msgstr "Tworzy now� list� kontakt�w"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:197
 msgid "Failed to connect to LDAP server"
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:216
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nie mo�na dokona� uwierzytelnienia na serwerze LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:239
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:648
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:1154
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:1176
 msgid "Error retrieving schema information"
 msgstr "B��d przy pobieraniu informacji o schemacie"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:1184
 msgid "Server did not respond with valid schema information"
 msgstr "Odpowied� serwera nie zawiera poprawnych informacji o schemacie"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:1640
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "Ta kopia Evolution nie obs�uguje protoko�u LDAP"
 
-#: addressbook/gui/component/addressbook-factory.c:1
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie mo�na zainicjowa� gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:1
+#: addressbook/gui/component/addressbook-storage.c:168
 msgid "Other Contacts"
 msgstr "Inne kontakty"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Nie mo�na otworzy� ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook.c:1
+#: 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."
@@ -571,7 +581,7 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Upewnij si�, �e �cie�ka\n"
 "ustnieje oraz �e ma ustawione odpowiednie uprawnienia."
 
-#: addressbook/gui/component/addressbook.c:1
+#: 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"
@@ -580,7 +590,7 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Mo�e to by� spowodowane\n"
 "u�yciem niepoprawnego URI lub nazwy serwera LDAP."
 
-#: addressbook/gui/component/addressbook.c:1
+#: 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"
@@ -591,7 +601,7 @@ msgstr ""
 "Aby m�c wykorzysta� LDAP, nale�y pobra� OpenLDAP spod podanego\n"
 "poni�ej adresu i ponownie skompilowa� Evolution ze �r�de�.\n"
 
-#: addressbook/gui/component/addressbook.c:1
+#: 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"
@@ -601,44 +611,44 @@ msgstr ""
 "u�yciem niepoprawnego URI lub niedost�pno�ci� serwera LDAP."
 
 #. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:582
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:625
 msgid "Failed to authenticate.\n"
 msgstr "Nie mo�na dokona� uwierzytelnienia.\n"
 
-#: addressbook/gui/component/addressbook.c:1
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sWprowad� has�o dla %s (u�ytkownik %s)"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr "Nazwa rozpoczyna si� od"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:783
 msgid "Email begins with"
 msgstr "E-mail rozpoczyna si� od"
 
-#: addressbook/gui/component/addressbook.c:1
-#: calendar/gui/cal-search-bar.c:1
+#: addressbook/gui/component/addressbook.c:784
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori� jest"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:1
-#: calendar/gui/cal-search-bar.c:1
+#: addressbook/gui/component/addressbook.c:785
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
-#: addressbook/gui/component/addressbook.c:1
+#: 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"
@@ -646,7 +656,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1
+#: 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"
@@ -654,25 +664,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1
-#: calendar/gui/cal-search-bar.c:1
+#: addressbook/gui/component/addressbook.c:1050
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Dowolna kategoria"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "URI kt�re ma wy�wietli� przegl�darka katalog�w"
 
@@ -681,55 +691,55 @@ msgstr "URI kt�re ma wy�wietli� przegl�darka katalog�w"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:178
 msgid "(none)"
 msgstr "(brak)"
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/component/e-address-popup.c:474
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 msgid "Primary Email"
 msgstr "G��wny e-mail"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Wyb�r czynno�ci"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Utw�rz nowy kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj adres do istniej�cego kontaktu \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Sprawdzanie ksi��ki adresowej..."
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/component/e-address-widget.c:1
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Zmie� informacje o kontakcie"
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/component/e-address-widget.c:1
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Dodaj do kontakt�w"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Do��czenie adresu e-mail"
 
-#: addressbook/gui/component/e-address-widget.c:1
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Wy��cz zapytania"
 
-#: addressbook/gui/component/e-address-widget.c:1
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "W��cz zapytania (Niebezpieczne!)"
 
@@ -737,76 +747,76 @@ msgstr "W��cz zapytania (Niebezpieczne!)"
 msgid "  S_how Supported Bases "
 msgstr " Wy�wi_etl obs�ugiwane typy "
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1234"
 msgstr "1234"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "380"
 msgstr "380"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr "666"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<- _Remove"
 msgstr "<- _Usu�"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<< Fewer Options"
 msgstr "<< Mniej opcji"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "�r�d�a ksi��ki adresowej"
 
-#: addressbook/gui/component/ldap-config.glade.h:1 mail/mail-account-gui.c:1
-#: mail/mail-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
+#: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Zawsze"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimowo"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Associated LDAP Attribute"
 msgstr "Powi�zany atrybut LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Attribute"
 msgstr "Atrybut"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -815,73 +825,73 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Connecting"
 msgstr "Nawi�zywanie po��czenia"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Corresponding Evolution Attribute"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "DN Customization"
 msgstr "Dopasowanie wyr�nionej nazwy"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "_Usu�"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Distinguished _name:"
 msgstr "_Wyr�niona nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Email Address:"
 msgstr "Adres e-mail:"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Evolution Attribute"
 msgstr "Atrybut Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution wykorzysta przy uwierzytelnianiu na serwerze podan� wyr�nion� "
 "nazw� (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution wykorzysta przy uwierzytelnianiu na serwerze podany adres e-mail."
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid "Finished"
 msgstr "Zako�czone"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Og�lne"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "LDAP Attribute"
 msgstr "Atrybut LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "LDAP Configuration Assistant"
 msgstr "Druid konfiguracji LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Mappings"
 msgstr "Odwzorowania"
 
-#: addressbook/gui/component/ldap-config.glade.h:1 mail/mail-account-gui.c:1
-#: mail/mail-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nigdy"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -891,71 +901,71 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid "Objectclasses"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid "Objectclasses Used in Evolution:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Objectclasses Used on Server:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "One"
 msgstr "Pojedyncze"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
 "Please select an Evolution attribute and an\n"
 "LDAP attribute to associate with it."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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:1
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "R_estore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "S_earch scope: "
 msgstr "_Zakres wyszukiwania: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:1
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1
+#: 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:1242
 msgid "Searching"
 msgstr "Wyszukiwanie"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Zaznacz wszystkie"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Usuni�ty"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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:1
+#: 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"
@@ -966,7 +976,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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"
@@ -975,44 +985,44 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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:1
+#: 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:1
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "Step 1: Server Information"
 msgstr "Krok 1: Informacje o serwerze"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Step 2: Connecting to Server"
 msgstr "Krok 2: Nawi�zywanie po��czenia z serwerem"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr "Krok 3: Przeszukiwanie katalogu"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr "Krok 4: Wy�wietlana nazwa"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Podrz�dne"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Supported Search Bases"
 msgstr "Obs�ugiwane podstawy wyszukiwania"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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"
@@ -1020,7 +1030,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1029,7 +1039,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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"
@@ -1037,7 +1047,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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"
@@ -1047,7 +1057,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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"
@@ -1057,20 +1067,20 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"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:1
+#: 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 "
@@ -1080,7 +1090,7 @@ msgstr ""
 "Zwr�� uwag� na fakt, �e ustawienie jej na \"Adres e-mail\" wymaga "
 "anonimowego dost�pu do serwera LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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"
@@ -1089,19 +1099,19 @@ msgstr ""
 "Jest to nazwa sewera, kt�ra b�dzie widoczna na li�cie folder�w Evolution.\n"
 "Nazwa ta przeznaczona jest tylko do wy�wietlania."
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr "Opcja ta kontroluje czas trwania wyszukiwania."
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: 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"
@@ -1110,162 +1120,162 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr "U�y_cie SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr "U�ycie wyr�nionej nazwy (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "Using email address"
 msgstr "U�ycie adresu e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
-#: mail/mail-account-gui.c:1 mail/mail-config.glade.h:1
+#: 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:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:1 shell/glade/e-folder-list.glade.h:1
+#: 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
+#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:107
 msgid "_Add ->"
 msgstr "_Dodaj ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:108
 msgid "_Add Mapping"
 msgstr "_Dodaj odwzorowanie"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add to DN"
 msgstr "_Dodaj do DN"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Always"
 msgstr "_Zawsze"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Delete Mapping"
 msgstr "_Usu� odwzorowanie"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Display name:"
 msgstr "_Wy�wietlana nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr "_Wyr�niona nazwa (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr "_Bez u�ycia SSL/TLS"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:1 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-list.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: 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
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Edit Mapping"
 msgstr "_Zmodyfikuj odwzorowanie"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:118
 msgid "_Evolution attribute:"
 msgstr "_Atrybut Evolution:"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_More Options >>"
 msgstr "_Wi�cej opcji >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Port number:"
 msgstr "Numer p_ortu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Search base:"
 msgstr "_Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Nazwa serwera:"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Timeout (minutes):"
 msgstr "_Czas oczekiwania (minuty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "account-druid"
 msgstr "druid-konta"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "account-editor"
 msgstr "edytor-konta"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "connecting-tab"
 msgstr "zak�adka-nawi�zywanie po��czenia"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr "zak�adka-dopasowywanie-db"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "general-tab"
 msgstr "zak�adka-og�lne"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr "zak�adka-odwzorowania"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr "zak�adka-klasy-obiekt�w"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "searching-tab"
 msgstr "zak�adka-wyszukiwanie"
 
@@ -1273,49 +1283,49 @@ msgstr "zak�adka-wyszukiwanie"
 msgid "Evolution's addressbook name selection interface."
 msgstr "Interfejs wyboru nazwy ksi��ki adresowej Evolution"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Generator interfejsu wyboru nazwy ksi��ki adresowej Evolution"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
-#: addressbook/gui/component/select-names/e-select-names.c:1
-#: composer/e-msg-composer-attachment-bar.c:1 filter/filter-filter.c:1
-#: filter/filter-rule.c:1 my-evolution/e-summary-shown.c:1
-#: shell/e-shortcuts-view.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: 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"
 msgstr "Usu�"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Usu� wszystko"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Wys�anie listu w formacie HTML"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Zmodyfikuj list� kontakt�w"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Lista kontakt�w bez nazwy"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d niewy�wietlonych)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Kontakt bez nazwy"
 
-#: addressbook/gui/component/select-names/e-select-names.c:1
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "Wyb�r kontakt�w z ksi��ki adresowej"
 
-#: addressbook/gui/component/select-names/e-select-names.c:1
+#: addressbook/gui/component/select-names/e-select-names.c:576
 msgid "Find contact in"
 msgstr ""
 
@@ -1323,25 +1333,25 @@ msgstr ""
 msgid "Select Names"
 msgstr "Wyb�r nazw"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Selected Contacts:"
 msgstr "Wybrane kontakty:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Show Contacts"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Folder:"
 
@@ -1349,60 +1359,60 @@ msgstr "_Folder:"
 msgid "A_ssistant's name:"
 msgstr "_Nazwisko asystenta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "Add_ress..."
 msgstr "Adre_s..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Anni_versary:"
 msgstr "_Rocznica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Birthda_y:"
 msgstr "_Urodziny:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "C_ontacts..."
 msgstr "_Kontakty..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorie..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr "Wsp�praca"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1369
 msgid "Contact Editor"
 msgstr "Edytor kontakt�w"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "D_epartment:"
 msgstr "_Oddzia�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/task-editor.c:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "Szczeg�y"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr "URL sygnalizuj�cy zaj�to��:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
 msgstr "N_azwa karty:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Full _Name..."
 msgstr "Pe�na _nazwa..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
@@ -1412,1095 +1422,1095 @@ msgstr ""
 "informacje kalendarza, podaj tutaj adres\n"
 "tych informacji."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "Nowy typ telefonu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr "No_tatki:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "_Organizacja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "P_rofession:"
 msgstr "Z_aw�d:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "Typy telefon�w"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "S_pouse:"
 msgstr "_Ma��onek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "This is the _mailing address"
 msgstr "_To jest adres pocztowy"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Wants to receive _HTML mail"
 msgstr "Chce otrzymywa� listy w HTML-u"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 filter/filter.glade.h:1
-#: mail/folder-browser.c:1 mail/mail-config.glade.h:1
-#: shell/glade/e-folder-list.glade.h:1 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1 ui/evolution.xml.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c: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:48
 msgid "_Delete"
 msgstr "_Usu�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "Tytu� s�u�_bowy:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
 msgstr "Nazwisko _szefa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "Przy_domek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "_Biuro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Public Calendar URL:"
 msgstr "URL publicznego _kalendarza:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Web page address:"
 msgstr "Adres strony _WWW:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Stany Zjednoczone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Algieria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Samoa Ameryka�ska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "Andora"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "Antarktyka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr "Antigua i Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentyna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbejd�an"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladesz"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "Bia�ogu�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "Bermudy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Boliwia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "Bo�nia i Hercegowina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "Wyspa Bouveta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brazylia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "Brytyjskie Terytorium Oceanu Spokojnego"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "Su�tanat Brunei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bu�garia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "Kambod�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr "Wyspy Zielonego Przyl�dka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Kajmany"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "Republika �rodkowej Afryki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Czad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Chiny"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Wyspa Bo�ego Narodzenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "Wyspy Kokosowe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Komory"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Kongo"
 
 # [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "Wyspy Cooka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Kostaryka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Chorwacja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Cypr"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Republika Czeska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Dania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "D�ibuti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "Dominika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Republika Dominikany"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Wschodni Timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ekwador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egipt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "Salwador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Gwinea R�wnikowa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Erytrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklandy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Wyspy Faroe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fid�i"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Francja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Gujana Francuska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polinezja Francuska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Francuskie terytoria po�udniowe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Niemcy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grecja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grenlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Gwadelupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Gwatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Gwinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Gwinea Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Gujana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Heard And McDonald Islands"
 msgstr "Wyspy Headra i McDonalda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "Watykan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Hinduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "W�gry"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Indie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonezja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Izrael"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "W�ochy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamajka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazahstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Kenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Korea, Republic Of"
 msgstr "Republika Korei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwejt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kirgistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Litwa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "�otwa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr "Makao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malezja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Mo�dawia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Marshall Islands"
 msgstr "Wyspy Marshalla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "Martynika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "Mauretania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "Majotta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Meksyk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Mikronezja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Antyle holenderskie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Nowa Kaledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nowa Zelandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Wyspa Norfolk"
 
 # [cyba] S� Mariany, wi�c p�nocne pewnie te�...
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "P�nocne Mariany"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norwegia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "Autonomia Palesty�ska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "Papua Nowa Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paragwaj"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "Filipiny"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rumunia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Federacja rosyjska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "St Kitts i Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent i Grenadyny"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "San Marino"
 msgstr "San Marino"
 
 # [cyba] Tak jest w moim atlasie, drugiej cz�ci nie ma
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Arabia Saudyjska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Szeszele"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "S�owacja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "S�owenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Wyspy Salomona"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Po�udniowa Afryka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Po�udniowa Georgia i Sandwich Po�udniowy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Hiszpania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "�wi�ta Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre i Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Wyspy Svalbard i Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Suazi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Szwecja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Szwajcaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tad�ykistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr "Zjednoczona Republika Tanzanii"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Tajlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "Trynidad i Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunezja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turcja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "Turks i Caicos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "Zjednoczone Emiraty Arabskie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Zjednoczone Kr�lestwo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "Oddalone drobne wyspy Stan�w Zjednoczonych"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Urugwaj"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Wenezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Wietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Virgin Islands, British"
 msgstr "Brytyjskie Wyspy Dziewicze"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Virgin Islands, U.S."
 msgstr "Ameryka�skie Wyspy Dziewicze"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "Wyspy Wallis i Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Zachodnia Sachara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
-#: my-evolution/Locations.h:1
+#: 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:1
-#: my-evolution/Locations.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugos�awia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
@@ -2512,58 +2522,58 @@ msgstr ""
 "Czy na pewno chcesz\n"
 "usun�� ten kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Usun�� kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:826
 msgid "Category editor not available."
 msgstr "Edytor kategorii nie jest dost�pny."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:833
 msgid "This contact belongs to these categories:"
 msgstr "Ten kontakt przynale�y do nast�puj�cych kategorii:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1047
 msgid "Save Contact as VCard"
 msgstr "Zapis kontaktu w formacie VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
 msgid "TTY/TDD"
 msgstr "TTy/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:2435
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nie mo�na odnale�� widgetu zwi�zanego z polem: \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "Szybkie dodanie kontaku"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Pe�na edycja"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "Pe�na nazwa"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:1
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:1
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:1
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2572,35 +2582,48 @@ msgstr ""
 "%s istnieje.\n"
 "Czy chcesz go nadpisa�?"
 
+#: addressbook/gui/contact-editor/file-exists.glade.h:1
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:2
+msgid "Don't bother translating this string.  It's not used."
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#, fuzzy
+msgid "Overwrite"
+msgstr "Nadpisa� plik?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Check Address"
 msgstr "Sprawd� adres"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Countr_y:"
 msgstr "_Kraj:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "_Miasto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "Sk_rzynka pocztowa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Stan/Prowincja:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "K_od pocztowy:"
 
@@ -2608,68 +2631,68 @@ msgstr "K_od pocztowy:"
 msgid "Check Full Name"
 msgstr "Pe�na nazwa"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr"
 
 # Nie ma odpowiednika tego w j�zyku polskim (wypada�oby mie� pusty napis, ale ten ^$#& gettext...)
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr " "
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Panna"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Pan"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Pani"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Panna"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Imi�:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Nazwisko:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Drugie:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Przyrostek:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tytu�:"
 
@@ -2677,33 +2700,33 @@ msgstr "_Tytu�:"
 msgid "List _name:"
 msgstr "Nazwa _listy:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 msgid "Members"
 msgstr "Cz�onkowie"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Type an email address or drag a contact into the list below:"
 msgstr "Wprowad� adres e-mail lub przeci�gnij kontakt do poni�szej listy:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ukrywanie adres�w przy wysy�aniu do tej listy"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Usu�"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "contact-list-editor"
 msgstr "Edytor listy kontakt�w"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:1
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
 msgid "Contact List Editor"
 msgstr "Edytor listy kontakt�w"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:1
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr "Zapisz list� w formacie VCard"
 
@@ -2711,20 +2734,20 @@ msgstr "Zapisz list� w formacie VCard"
 msgid "Add Anyway"
 msgstr "Dodaj mimo tego"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr "Wykryto powt�rzony kontakt"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 msgid "New Contact:"
 msgstr "Nowy Kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 msgid "Original Contact:"
 msgstr "Oryginalny kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2736,15 +2759,15 @@ msgstr ""
 msgid "Change Anyway"
 msgstr "Zmie� mimo tego"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Zmieniony kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "Koliduj�cy kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -2752,320 +2775,319 @@ msgstr ""
 "Folder zawiera ju� kontakt o tej samej nazwie lub adresie e-mail.\n"
 "Czy pomimo tego chcesz go doda�?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:1
-#: widgets/misc/e-filter-bar.c:1
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:1
-#: mail/mail-search.c:1
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:1
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:1
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "liczba kart: 1"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:1
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "liczba kart: %d"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:1
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 msgid "Error getting book view"
 msgstr "B��d przy pobieraniu widoku ksi��ki adresowej"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: addressbook/gui/widgets/e-minicard.c:1
+#: 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"
 msgstr "B��d przy modyfikacji karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: shell/evolution-shell-component.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1141
 msgid "Success"
 msgstr "Sukces"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: camel/providers/imap/camel-imap-command.c:1
-#: camel/providers/imap/camel-imap-command.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1 shell/e-shell.c:1
-#: shell/e-storage.c:1 shell/evolution-shell-component.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: 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 "Nieznany b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Repozytorium roz��czone"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1 shell/e-storage.c:1
-#: shell/evolution-shell-component.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Brak uprawnie�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Nie odnaleziono karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Karta z tym ID ju� istnieje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protok� nie jest obs�ugiwany"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/print.c:1
-#: camel/camel-service.c:1 camel/camel-service.c:1
-#: camel/camel-service.c:1 camel/camel-service.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: 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:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "Anulowane"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Authentication Failed"
 msgstr "Uwierzytelnienie nie powiod�o si�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Addressbook does not exist"
 msgstr "Ksi��ka adresowa nie istnieje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Inny b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: calendar/gui/dialogs/save-comp.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Czy chcesz zapisa� zmiany?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "B��d przy dodawaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "B��d przy dodawaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "B��d przy modyfikacji listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "B��d przy usuwaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "B��d przy usuwaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Pytanie o wy�wietlenie kart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Wy�wietlenie kart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: 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:1
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Przeniesienie list�w do folderu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kopiuje zaznaczone zadanie"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "* Click here to add a contact *"
 msgstr "* Kliknij, aby doda� kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 msgid "Primary Phone"
 msgstr "G��wny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Assistant Phone"
 msgstr "Telefon asystenta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Business Phone"
 msgstr "Telefon s�u�bowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Callback Phone"
 msgstr "Telefon callbacka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Company Phone"
 msgstr "Telefon firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Home Phone"
 msgstr "Telefon domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Business Address"
 msgstr "Adres firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Home Address"
 msgstr "Adres domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Mobile Phone"
 msgstr "Telefon przeno�ny"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Car Phone"
 msgstr "Telefon samochodowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 msgid "Business Phone 2"
 msgstr "Telefon s�u�bowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:373
 msgid "Home Phone 2"
 msgstr "Telefon domowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:375
 msgid "Other Phone"
 msgstr "Inny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:381
 msgid "Other Address"
 msgstr "Inny adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: importers/evolution-gnomecard-importer.c:1 importers/pine-importer.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:461
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Ksi��ka adresowa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Zapisz w formacie VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "New Contact..."
 msgstr "Nowy kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "New Contact List..."
 msgstr "Nowa lista kontakt�w..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Go to Folder..."
 msgstr "Przejd� do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Import..."
 msgstr "Zaimportuj..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Search for Contacts..."
 msgstr "Szukaj kontakt�w..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Addressbook Sources..."
 msgstr "�r�d�a ksi��ki adresowej..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 msgid "Pilot Settings..."
 msgstr "Ustawienia pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prze�lij kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:913
 msgid "Send Message to Contact"
 msgstr "Wy�lij list do kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:916
 msgid "Print Envelope"
 msgstr "Wydrukuj kopert�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:920
 msgid "Copy to folder..."
 msgstr "Skopiuj do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:921
 msgid "Move to folder..."
 msgstr "Przenie� do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-tasks.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Wytnij"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-tasks.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Wklej"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1 filter/libfilter-i18n.h:1
-#: mail/mail-accounts.c:1 shell/e-shell-folder-commands.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
+#: 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
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Usu�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: 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 "Bie��cy widok"
 
@@ -3073,7 +3095,7 @@ msgstr "Bie��cy widok"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: 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,�,�"
@@ -3082,12 +3104,12 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: 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:1
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3095,20 +3117,20 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:1
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "oraz %d innych kart."
 
-#: addressbook/gui/widgets/e-minicard-control.c:1
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "oraz jedna inna karta."
 
-#: addressbook/gui/widgets/e-minicard-control.c:1
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Zapisz w ksi��ce adresowej"
 
-#: addressbook/gui/widgets/e-minicard-view.c:1
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -3122,7 +3144,7 @@ msgstr ""
 "\n"
 "Dwukrotne klikni�cie spowoduje utworzenie nowego kontaktu."
 
-#: addressbook/gui/widgets/e-minicard-view.c:1
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -3132,21 +3154,21 @@ msgstr ""
 "\n"
 "Brak element�w do wy�wietlenia w tym widoku."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:1
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Widok karty"
 
-#: addressbook/printing/e-contact-print-envelope.c:1
-#: addressbook/printing/e-contact-print-envelope.c:1
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Wydrukuj kopert�"
 
-#: addressbook/printing/e-contact-print.c:1
+#: addressbook/printing/e-contact-print.c:1115
 msgid "Print cards"
 msgstr "Wydrukuj karty"
 
-#: addressbook/printing/e-contact-print.c:1
-#: addressbook/printing/e-contact-print.c:1
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
 msgid "Print card"
 msgstr "Wydrukuj kart�"
 
@@ -3154,221 +3176,225 @@ msgstr "Wydrukuj kart�"
 msgid "10 pt. Tahoma"
 msgstr "10-punktowa Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8-punktowa Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Pustych formatek na ko�cu:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Tre��"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Dolny:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Wymiary:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
 msgstr "_Czcionka..."
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Stopka:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "G��wka"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "G��wka/Stopka"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Nag��wki"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Nag��wek dla ka�dej litery"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Wysoko��:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Bezpo�rednio jedna po drugiej"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Do��czanie:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
-#: calendar/gui/tasks-control.c:1
+#: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Pejza�"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Lewy:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Zak�adki liter z boku"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marginesy"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: addressbook/printing/e-contact-print.glade.h:1 mail/mail-config.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opcje"
 
-#: addressbook/printing/e-contact-print.glade.h:1
-#: calendar/gui/tasks-control.c:1
+#: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "U�o�enie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
-#: my-evolution/Locations.h:1
+#: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Strona"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Ustawienia strony:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Papier"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "�r�d�o papieru:"
 
 #. Portrait
-#: addressbook/printing/e-contact-print.glade.h:1
-#: calendar/gui/tasks-control.c:1
+#: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portret"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Podgl�d:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Drukowanie przy u�yciu odcieni szaro�ci"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Odwrotnie na stronach parzystych"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Prawy:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Sekcje:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Cieniowanie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Rozpoczynana na nowej stronie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Nazwa stylu:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "G�rny:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Typ:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Szeroko��:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "_Czcionka..."
 
-#: calendar/cal-util/cal-component.c:1
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Termin pozbawiony nazwy"
 
-#: calendar/cal-util/cal-util.c:1 calendar/cal-util/cal-util.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: 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:748
 msgid "High"
 msgstr "Wysoki"
 
-#: calendar/cal-util/cal-util.c:1 calendar/cal-util/cal-util.c:1
-#: calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: 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:747
 msgid "Normal"
 msgstr "Zwyk�y"
 
-#: calendar/cal-util/cal-util.c:1 calendar/cal-util/cal-util.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: 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:746
 msgid "Low"
 msgstr "Niski"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/cal-util/cal-util.c:520
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: 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 "B��d przy komunikacji z serwerem kalendarza"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
+#: calendar/conduits/calendar/calendar-conduit.c:1372
+#: calendar/conduits/calendar/calendar-conduit.c:1375
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie mo�na odczyta� bloku aplikacji kalendarza pilota"
 
-#: calendar/conduits/todo/todo-conduit.c:1
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Domy�lny priorytet:"
 
-#: calendar/conduits/todo/todo-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie mo�na odczyta� bloku aplikacji \"do zrobienia\" pilota"
 
@@ -3376,47 +3402,47 @@ msgstr "Nie mo�na odczyta� bloku aplikacji \"do zrobienia\" pilota"
 msgid "A Bonobo control which displays a task list."
 msgstr "Komponent Bonobo wy�wietlaj�cy list� zada�."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "Komponent Bonobo wy�wietlaj�cy kalendarz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Kalendarz i zadania"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Configuration control for the Evolution Calendar."
 msgstr "Formant konfiguracji kalendarza Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Konfiguracja strefy czasowej, kalendarza i listy zada�."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Przegl�darka kalendarza iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Komponent Bonobo obs�uguj�cy kalendarz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the Evolution Tasks control"
 msgstr "Generator formantu zada� Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the calendar iTip view control"
 msgstr "Generator formantu wy�wietlania iTip kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the sample Calendar control"
 msgstr "Generator przyk�adowego formantu kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Generator centralizuj�cy okna edytora komponentu kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to create a component editor factory"
 msgstr "Generator tworz�cy generator komponentu edytora"
 
@@ -3424,27 +3450,27 @@ msgstr "Generator tworz�cy generator komponentu edytora"
 msgid "Alarm notification service"
 msgstr "Us�uga przypominania za pomoc� alarmu"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
 msgid "Factory for the alarm notification service"
 msgstr "Generator us�ugi przypominania za pomoc� alarmu"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Starting:"
 msgstr "Pocz�tek:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
 msgid "Ending:"
 msgstr "Koniec:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "niepoprawny czas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 msgid "Evolution Alarm"
 msgstr "Alarm Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm o %s"
@@ -3454,23 +3480,23 @@ msgstr "Alarm o %s"
 msgid "C_lose"
 msgstr "Zam_knij"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Snoo_ze"
 msgstr "_U�pij"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr "Czas u�pienia (minuty)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "_Edit appointment"
 msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Brak opisu."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: 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"
@@ -3482,13 +3508,13 @@ msgstr ""
 "z powiadamianiem za po�rednictwem list�w. Zamiast tego\n"
 "zostanie wy�wietlone zwyk�e okno przypomnienia."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
-#: calendar/gui/tasks-control.c:1 mail/mail-callbacks.c:1
-#: widgets/misc/e-messagebox.c:1
+#: 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 "Ostrze�enie"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3505,130 +3531,130 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz uruchomi� ten program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 msgid "Do not ask me about this program again."
 msgstr "Bez pytania o ten program w przysz�o�ci."
 
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Nie mo�na zainicjowa� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie mo�na utworzy� generatora us�ugi przypominania za pomoc� alarmu"
 
-#: calendar/gui/cal-search-bar.c:1
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Zestawienie zawiera"
 
-#: calendar/gui/cal-search-bar.c:1
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis zawiera"
 
-#: calendar/gui/cal-search-bar.c:1
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentarz zawiera"
 
-#: calendar/gui/cal-search-bar.c:1 mail/mail-ops.c:1
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
 msgid "Unmatched"
 msgstr "Niedopasowane"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:1 calendar/gui/e-day-view-top-item.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view-main-item.c:1
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:1 calendar/gui/calendar-commands.c:1
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:1 calendar/gui/calendar-commands.c:1
-#: calendar/gui/calendar-commands.c:1 calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:1
-#: calendar/gui/e-week-view-main-item.c:1 calendar/gui/print.c:1
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie mo�na utworzy� widoku kalendarza.  Zweryfikuj ustawienia ORBita i OAF-a."
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Prywatny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Publiczny"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Wolny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-calendar-table.c:1
-#: calendar/gui/e-meeting-time-sel.c:1
-#: shell/evolution-shell-component.c:1
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Zaj�ty"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/print.c:1
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Przed rozpocz�ciem"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/print.c:1
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Trwaj�ce"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/print.c:1
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Zako�czone"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1049
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3639,153 +3665,173 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1 calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1
-#: mail/folder-browser.c:1 mail/mail-account-gui.c:1
-#: mail/mail-account-gui.c:1 mail/mail-accounts.c:1
-#: mail/mail-accounts.c:1 mail/mail-config.glade.h:1
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:1
-#: widgets/misc/e-cell-date-edit.c:1 widgets/misc/e-dateedit.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: 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: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
+#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1717
 msgid "Recurring"
 msgstr "Powtarzanie"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1719
 msgid "Assigned"
 msgstr "Przyporz�dkowany"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: 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:568
+#: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Tak"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nie"
 
-#: calendar/gui/calendar-view-factory.c:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Widok dnia"
 
-#: calendar/gui/calendar-view-factory.c:1
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Widok tygodnia roboczego"
 
-#: calendar/gui/calendar-view-factory.c:1
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Widok tygodnia"
 
-#: calendar/gui/calendar-view-factory.c:1
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Widok miesi�ca"
 
-#: calendar/gui/component-factory.c:1 calendar/gui/gnome-cal.c:1
-#: importers/netscape-importer.c:1 my-evolution/my-evolution.glade.h:1
-#: shell/e-local-storage.c:1 shell/e-shortcuts.c:1
+#: 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 "Kalendarz"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Folder zawieraj�cy terminy i zdarzenia"
 
-#: calendar/gui/component-factory.c:1 calendar/gui/e-tasks.c:1
-#: calendar/gui/print.c:1 calendar/gui/tasks-control.c:1
-#: calendar/importers/icalendar-importer.c:1
-#: importers/netscape-importer.c:1 my-evolution/e-summary-tasks.c:1
-#: my-evolution/e-summary-tasks.c:1 shell/e-local-storage.c:1
-#: shell/e-shortcuts.c:1
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "URL publicznego _kalendarza:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Folder zawieraj�cy terminy i zdarzenia"
+
+#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
+#: calendar/importers/icalendar-importer.c:704
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:311
+#: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Zadania"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Folder zawieraj�cy pozycje do wykonania"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Wydruku zada�"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Folder zawieraj�cy pozycje do wykonania"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Tworzy nowy termin"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "_Spotkanie"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:741
 msgid "Create a new meeting request"
 msgstr "Tworzy now� pro�b� o spotkanie"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:750
 msgid "New All Day Appointment"
 msgstr "Nowy termin ca�odniowy"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:750
 msgid "All _Day Appointment"
 msgstr "Nowy t_ermin ca�odniowy"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:751
 msgid "Create a new all-day appointment"
 msgstr "Tworzy nowy termin ca�odniowy"
 
-#: calendar/gui/control-factory.c:1
+#: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nie mo�na otworzy� folderu o URI \"%s\""
 
-#: calendar/gui/control-factory.c:1
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI wy�wietlany przez kalendarz"
 
-#: calendar/gui/control-factory.c:1
+#: calendar/gui/control-factory.c:174
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Ustawienia alarmu d�wi�kowego"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "Ustawienia alarmu z komunikatem"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "Ustawienia alarmu z wys�aniem listu"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "Ustawienia alarmu z uruchomieniem programu"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "Ustawienia nieznanego alarmu"
 
@@ -3793,211 +3839,212 @@ msgstr "Ustawienia nieznanego alarmu"
 msgid "Alarm Repeat"
 msgstr "Powt�rzenia alarmu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+#, fuzzy
+msgid ""
+"Evolution does not yet support email notification for reminders.  You will "
+"not be able to edit the options for this reminder."
+msgstr ""
+"To jest przypomnienie za pomoc� listu, lecz Evolution nie obs�uguje jeszcze "
+"tego typu przypomnie�, wi�c modyfikacja jego opcji nie b�dzie mo�liwa."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Wy�wietlany komunikat"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Odtwarzany d�wi�k:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Powtarzanie alarmu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Uruchamiany program:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-msgid ""
-"This is an email reminder, but Evolution does not yet support this kind of "
-"reminders.  You will not be able to edit the options for this reminder."
-msgstr ""
-"To jest przypomnienie za pomoc� listu, lecz Evolution nie obs�uguje jeszcze "
-"tego typu przypomnie�, wi�c modyfikacja jego opcji nie b�dzie mo�liwa."
-
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Argumenty programu:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1 filter/filter-datespec.c:1
-#: filter/filter.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dni"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "extra times every"
 msgstr "dodatkowych razy co"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1 filter/filter-datespec.c:1
-#: filter/filter.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1 filter/filter-datespec.c:1
-#: filter/filter.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 dzie�"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d tygodni"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 tydzie�"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d godzin"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 godzina"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Odtworzenie d�wi�ku"
 
-#: calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:387
+#: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Wy�wietlenie komunikatu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Wys�anie listu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:395
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Uruchomienie programu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Wykonanie nieznanej czynno�ci"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:413
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s przed pocz�tkiem terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:416
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po pocz�tku terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:421
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na pocz�tku terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:430
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s przed ko�cem terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:433
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po ko�cu terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:438
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na ko�cu terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s o %s"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:468
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s z nieznanym typem warunku"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr "Proste"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Date/Time:"
 msgstr "Data/Czas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zestawienie:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "_Options..."
 msgstr "_Opcje..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "przed"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
 msgstr "koniec terminu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "hour(s)"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1 mail/mail-config.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
 msgid "minute(s)"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
 msgstr "pocz�tek terminu"
 
@@ -4005,396 +4052,396 @@ msgstr "pocz�tek terminu"
 msgid "05 minutes"
 msgstr "05 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "15 minutes"
 msgstr "15 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1 mail/mail-config.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
 msgid "Alerts"
 msgstr "Alarmy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Ustawienia kalendarza i zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Kolor zaleg�ych zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Kolor dzisiejszych zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Day _ends:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "Pi�tek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Godzin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "Poniedzia�ek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "S_un"
 msgstr "_Nie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "Sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Wy�wietlanie _numer�w tygodni w przegl�darce dat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_asks due today:"
 msgstr "Zadania na _dzi�:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "_Czw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Task List"
 msgstr "Lista zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Czas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Strefa c_zasowa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "�roda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ui/evolution-calendar.xml.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Tydzie� roboczy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12-godzinny (AP/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24-godzinny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Potwierdzanie przed usuni�ciem element�w"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Kompresowanie weekend�w na widoku miesi�cznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Day begins:"
 msgstr "Pocz�tek _dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "Wy�wi_etlanie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Pi�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: mail/mail-config.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "Og�_lne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Ukrywanie zako�czonych zada� po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "P_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Overdue tasks:"
 msgstr "Z_aleg�e zadania:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 "Wy�wietlanie _czas�w zako�czenia termin�w w widoku tygodniowym i miesi�cznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Time divisions:"
 msgstr "Prze_dzia�y czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Tue"
 msgstr "_Wto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "�_ro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "before every appointment"
 msgstr "przed ka�dym terminem"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:56
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Czy na pewno chcesz anulowa� i usun�� to spotkanie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:65
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Czy na pewno chcesz anulowa� i usun�� to zadanie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:74
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Czy na pewno chcesz anulowa� i usun�� ten wpis dziennika?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Zdarzenie zosta�o usuni�te."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Zadanie zosta�o usuni�te."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Wpis dziennika zosta� usuni�ty."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Wprowadzono zmiany. Anulowa� je wszystkie i zamkn�� edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Nie wprowadzono �adnych zmian, zamkn�� edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Zdarzenie zosta�o zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Zadanie zosta�o zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Wpis dziennika zosta� zmieniony."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Wprowadzono zmiany. Anulowa� je wszystkie i uaktualni� edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nie wprowadzono �adnych zmian, uaktualni� edytor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
 msgid " (Completed "
 msgstr " (Zako�czone "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
 msgid "Completed "
 msgstr "Zako�czone"
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
 msgid " (Due "
 msgstr " (Nale�ne "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
 msgid "Due "
 msgstr "Nale�ne "
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:342
 msgid "Could not update invalid object"
 msgstr "Nie mo�na uaktualni� niepoprawnego obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:345
 msgid "Object not found, not updated"
 msgstr "Nie odnaleziono obiektu, bez aktualizacji"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:348
 msgid "You don't have permissions to update this object"
 msgstr "Brak uprawnie� do aktualizacji tego obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:351
 msgid "Could not update object"
 msgstr "Nie mo�na uaktualni� obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 composer/e-msg-composer.c:1
+#: calendar/gui/dialogs/comp-editor.c:1220
+#: 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 "Zapisz jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1
-#: calendar/gui/dialogs/comp-editor.c:1
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:1321
+#: calendar/gui/dialogs/comp-editor.c:1345
+#: calendar/gui/dialogs/comp-editor.c:1369
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:1396
 msgid "Unable to obtain current version!"
 msgstr "Nie mo�na uzyska� bie��cej wersji!"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Czy na pewno chcesz usun�� termin \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Czy na pewno chcesz usun�� ten pozbawiony nazwy termin?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Czy na pewno chcesz usun�� zadanie \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Czy na pewno chcesz usun�� to pozbawione nazwy zadanie?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Czy na pewno chcesz usun�� wpis dziennika zatytu�owany \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Czy na pewno chcesz usun�� ten niezatytu�owany wpis dziennika?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Czy na pewno chcesz usun�� %d termin�w?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Czy na pewno chcesz usun�� %d zada�?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Czy na pewno chcesz usun�� %d wpis�w dziennika"
@@ -4403,35 +4450,35 @@ msgstr "Czy na pewno chcesz usun�� %d wpis�w dziennika"
 msgid "Addressbook..."
 msgstr "Ksi��ka adresowa..."
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr "Oddelegowanie do:"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: calendar/gui/dialogs/event-editor.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Powtarzalno��"
 
-#: calendar/gui/dialogs/event-editor.c:1
-#: calendar/gui/dialogs/event-editor.c:1
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "Planowanie"
 
-#: calendar/gui/dialogs/event-editor.c:1
-#: calendar/gui/dialogs/event-editor.c:1
-#: calendar/gui/dialogs/event-editor.c:1 ui/evolution-event-editor.xml.h:1
+#: 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 "Spotkanie"
 
@@ -4439,81 +4486,81 @@ msgstr "Spotkanie"
 msgid "A_ll day event"
 msgstr "Wydarzenie ca�odni_owe"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "B_usy"
 msgstr "Z_aj�ty"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klasyfikacja"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Taj_ny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Data i czas"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:7
 msgid "F_ree"
 msgstr "_Wolny"
 
 # FIXME (cyba): skr�t klawiszowy
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "L_ocation:"
 msgstr "P_o�o�enie:"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "P_rywatny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Pu_bliczny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Forma wy�wietlania czasu"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Z_estawienie:"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontakty..."
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Czas zako�czenia:"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Cza_s rozpocz�cia:"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Wymagany jest organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Wymagany jest co najmniej jeden uczestnik."
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Ta osoba ju� uczestniczy w spotkaniu!"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
@@ -4522,161 +4569,161 @@ msgstr "_Oddeleguj do..."
 msgid "Attendee"
 msgstr "Uczestnik"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Kliknij, aby doda� uczestnika"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Wsp�lna nazwa"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Oddelegowane od"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Oddelegowane do"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "J�zyk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Cz�onek"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rola"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1 filter/libfilter-i18n.h:1
-#: mail/message-list.etspec.h:1
+#: 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:37
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stan"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "_Change Organizer"
 msgstr "_Zmie� organizatora"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Zapro� innych..."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
 msgid "st"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
 msgid "nd"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
 msgid "rd"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
+#: calendar/gui/dialogs/recurrence-page.c:135
+#: calendar/gui/dialogs/recurrence-page.c:136
+#: calendar/gui/dialogs/recurrence-page.c:137
+#: calendar/gui/dialogs/recurrence-page.c:138
+#: calendar/gui/dialogs/recurrence-page.c:139
+#: calendar/gui/dialogs/recurrence-page.c:140
+#: calendar/gui/dialogs/recurrence-page.c:141
+#: calendar/gui/dialogs/recurrence-page.c:142
+#: calendar/gui/dialogs/recurrence-page.c:143
+#: calendar/gui/dialogs/recurrence-page.c:144
+#: calendar/gui/dialogs/recurrence-page.c:145
+#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:150
+#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:155
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Termin zawiera powt�rzenia, kt�rych nie mo�na zmienia� za pomoc� Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1064
 msgid "first"
 msgstr "pierwszy"
 
 # FIXME (drugi / sekunda)
-#: calendar/gui/dialogs/recurrence-page.c:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "drugi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1066
 msgid "third"
 msgstr "trzeci"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1067
 msgid "fourth"
 msgstr "czwarty"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1068
 msgid "last"
 msgstr "ostatni"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "Other Date"
 msgstr "Inna data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dzie�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "powt�rzeniami"
 
@@ -4684,324 +4731,324 @@ msgstr "powt�rzeniami"
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Co"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Wyj�tki"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Preview"
 msgstr "Podgl�d"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Regu�a powtarzalno�ci"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "_Custom recurrence"
 msgstr "D_owolna powtarzalno��"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "Z_mie�"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "_No recurrence"
 msgstr "_Brak powtarzalno�ci"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Simple recurrence"
 msgstr "P_rosta powtarzalno��"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "z"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "forever"
 msgstr "bez ko�ca"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
 msgid "month(s)"
 msgstr "miesi�cy"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "a� do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "tygodni"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "lat"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:56
 msgid "The meeting information has been created. Send it?"
 msgstr "Zosta�a utworzona informacja o spotkaniu. Czy wys�a� j�?"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Informacje o spotkaniu zosta�y zmienione. Czy wys�a� aktualn� wersj�?"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:66
 msgid "The task assignment information has been created. Send it?"
 msgstr "Zosta�a utworzona informacja o przypisaniu zadania. Czy wys�a� j�?"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:70
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informacje o zadaniu zosta�y zmienione. Czy wys�a� aktualn� wersj�?"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% zako�czenia"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:5
 msgid "Date Completed:"
 msgstr "Data zako�czenia:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr "Wymaga dzia�ania"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Post�p"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: my-evolution/e-summary-preferences.c:1
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "P_riorytet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Stan:"
 
-#: calendar/gui/dialogs/task-editor.c:1
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Proste"
 
-#: calendar/gui/dialogs/task-editor.c:1
-#: calendar/gui/dialogs/task-editor.c:1
-#: calendar/gui/dialogs/task-editor.c:1
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "Przyporz�dkowanie"
 
-#: calendar/gui/dialogs/task-page.glade.h:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:1
+#: 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:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Cza_s rozpocz�cia:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Czas zako�czenia:"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:440
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:441
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:442
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:443
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:444
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:445
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:446
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:447
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:448
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:449
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:450
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiekt�w"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 mail/folder-browser.c:1
-#: shell/e-shortcuts-view.c:1 ui/evolution-addressbook.xml.h:1
+#: 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 "_Otw�rz"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr "Z_apisz jako..."
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 calendar/gui/e-week-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1 ui/my-evolution.xml.h:1
+#: 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 "Wy_drukuj..."
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 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 "_Wytnij"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-list.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: 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 "S_kopiuj"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: calendar/gui/e-week-view.c:1 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-list.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: 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"
 msgstr "Wk_lej"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr "P_rzypisz zadanie"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr "Prze�lij w formacie i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Oznacz jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Oznacz zadania jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Usu� zaznaczone zadania"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1
+#: 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 "Aktualizowanie obiekt�w"
 
-#: calendar/gui/e-calendar-table.c:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknij, aby doda� zadanie"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:1 camel/camel-filter-driver.c:1
-#: camel/camel-filter-driver.c:1
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "Zako�czone"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Data wykonania"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Pozycja geograficzna"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Priorytet"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Data rozpocz�cia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
-#: my-evolution/component-factory.c:1 shell/e-shell.c:1
-#: shell/e-shortcuts.c:1
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Zestawienie"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Porz�dek zada�"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:1
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5012,147 +5059,147 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:1
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i-minutowe przedzia�y czasu"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1 calendar/gui/print.c:1
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: calendar/gui/print.c:1
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: calendar/gui/print.c:1
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:1
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Nowy _termin"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _ca�odniowe"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 msgid "New Meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/e-day-view.c:1 ui/evolution-comp-editor.xml.h:1
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Wydrukuj..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: ui/evolution-calendar.xml.h:1
+#: 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 "Przejd� do d_zisiaj"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "_Przejd� do daty..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: ui/evolution-calendar.xml.h:1
+#: 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 "_Opublikuj informacj� o zaj�to�ci"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 msgid "_Configure..."
 msgstr "S_konfiguruj..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 msgid "_Configure Pilot..."
 msgstr "Sk_onfiguruj Pilota..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: 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 "Z_apisz jako..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 msgid "_Schedule Meeting..."
 msgstr "Zap_lanuj spotkanie..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 msgid "_Forward as iCalendar..."
 msgstr "Prze�lij w formacie i_Calendar..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr "Przekszta�� to wyst�pienie w p_rzesuwalne"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "Usu� to _wyst�pienie"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "Usu� w_szystkie wyst�pienia"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: shell/e-shell-view-menu.c:1
+#: 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 "W systemie nie jest zainstalowany GNOME Pilot tools."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: shell/e-shell-view-menu.c:1
+#: 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 "B��d przy wykonywaniu %s."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr "<b>Pocz�tek:</b> "
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:600
 msgid "<b>Ends:</b> "
 msgstr "<b>Koniec:<b>"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:613
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:623
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Opis:</b> %s"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "Informacje iKalendarza"
 
 #. Title
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "B��d iKalendarza"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "Nieznana osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5160,573 +5207,586 @@ msgstr ""
 "<br> Przejrzyj wy�wietlone informacje, a nast�pnie wybierz czynno�� z "
 "poni�szego menu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Brak</i>"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:789
 msgid "Location:"
 msgstr "Po�o�enie:"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "Stan:"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/itip-utils.c:1
+#: 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 "Zaakceptowane"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/itip-utils.c:1
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 msgid "Tentatively Accepted"
 msgstr "Pr�bna akceptacja"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/itip-utils.c:1 calendar/gui/itip-utils.c:1
+#: 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 "Odrzucone"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 camel/camel-tcp-stream-openssl.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1 mail/folder-browser.c:1
-#: mail/mail-display.c:1 widgets/misc/e-charset-picker.c:1
-#: widgets/misc/e-charset-picker.c:1
+#: 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:834
+#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: 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 "Wyb�r czynno�ci:"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Aktualizacja"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: shell/e-shell.c:1 widgets/misc/e-cell-date-edit.c:1
+#: 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:1
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "Akceptacja"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Pr�bna akceptacja"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Odrzucenie"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Wys�anie informacji o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Pobranie stanu wezwanej osoby"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Wys�anie naj�wie�szej informacji"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/itip-utils.c:1
-#: shell/evolution-shell-component.c:1 ui/evolution-mail-global.xml.h:1
+#: 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 "Anuluj"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Informacja o spotkaniu opublikowana przez <b>%s</b>."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Informacje o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1050
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zwraca si� o twoj� obecno�� na spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Propozycja spotkania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1055
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> chce dodania do istniej�cego spotkania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Aktualizacja spotkania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1060
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> chce otrzyma� naj�wie�sze informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Zwr�cenie si� o aktualizacj� spotkania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1068
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpowiedzia� na zwr�cenie si� o spotkanie."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Odpowied� na spotkanie"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1076
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> anulowa� spotkanie."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Anulowanie spotkania"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1
+#: 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> wys�a� niezrozumia�� wiadomo��."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Niepoprawna wiadomo�� o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1106
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Informacja o zadaniu opublikowana przez <b>%s</b>."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Informacje o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1111
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> zwraca si� o wykonanie przez ciebie zadania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Propozycja zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1116
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> chce dodania do istniej�cego zadania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Aktualizacja zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1121
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> chce otrzyma�  naj�wie�sze informacje o zadaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Zwr�cenie si� o aktualizacj� zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1129
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpowiedzia� na przypisanie zadania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Odpowied� na zadanie"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> anulowa� zadanie."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Anulowanie zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Niepoprawna wiadomo�� o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Informacja o zaj�to�ci opublikowana przez <b>%s</b>."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Informacja o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1170
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> zwraca si� o informacj� o zaj�to�ci."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Zwr�cenie si� o informacj� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1175
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odpowiedzia� na zwr�cenie si� o informacj� o zaj�to�ci."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Odpowied� z informacj� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Niepoprawna wiadomo�� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1236
 msgid "The message does not appear to be properly formed"
 msgstr "Forma listu jest niepoprawna"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Lista zawiera tylko nieobs�ugiwane ��dania."
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: 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 "Za��cznik nie zawiera poprawnego komunikatu kalendarza"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "Za��cznik nie zawiera daj�cych si� wy�wietli� element�w kalendarza"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: 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:1 calendar/gui/e-itip-control.c:1
+#: 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:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 msgid "Object could not be found\n"
 msgstr "Nie mo�na odnale�� obiektu\n"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-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 "Brak uprawnie� do aktualizacji tego obiektu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Aktualizacja zako�czona\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Nie mo�na uaktualni� pliku kalendarza!\n"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: 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 ""
 "Nie mo�na uaktualni� stanu uczestnika, poniewa� element ju� nie istnieje"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1573
 #, fuzzy
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Odpowied� nie pochodzi odaktualnego uczestnika. Czy doda� nadawc� jako "
 "uczestnika?"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1585
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Nie mo�na uaktualni� stanu uczestnika, poniewa� jest on nieprawid�owy!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "Brak uprawnie� do aktualizacji tego obiektu"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika zosta� uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Nie mo�na uaktualni� stanu uczestnika!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Usuni�cie zako�czone"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "Element zosta� wys�any!\n"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "Nie mo�na wys�a� elementu!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1807
 msgid "Select Calendar Folder"
 msgstr "Wyb�r folderu kalendarza"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1814
 msgid "Select Tasks Folder"
 msgstr "Wyb�r folderu zada�"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
 msgstr "%P %%"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--do--"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Komunikat kalendarza"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Wczytywanie kalendarza"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Wczytywanie kalendarza..."
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Komunikat serwera:"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "data-pocz�tkowa"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "data-ko�cowa"
 
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Osoby przewodnicz�ce"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "Wymagani uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Opcjonalni uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:87
 msgid "Resources"
 msgstr "Zasoby"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr "Osoba"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr "Zas�b"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "Pomieszczenie"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "Przewodniczenie"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 msgid "Required Participant"
 msgstr "Wymagany uczestnik"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr "Opcjonalny uczestnik"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr "Nie uczestnik"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Pr�bnie zaakceptowane"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "Oddelegowane"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "W trakcie"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:1
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2114
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:1
-#: calendar/gui/e-meeting-time-sel.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1 widgets/misc/e-dateedit.c:1
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Poza biurem"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "Opcj_e"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Wy�wietlanie _tylko godzin roboczych"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Wy�wietlanie w p_owi�kszeniu"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Uaktualnij informacj� o zaj�to�ci"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Automatyczny wyb�r"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Wszyscy _ludzie i jeden zas�b"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Wy_magani ludzie"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Wymagani ludzie i j_eden zas�b"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Czas p_ocz�tku spotkania:"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Czas _ko�ca spotkania:"
 
-#: calendar/gui/e-tasks.c:1 calendar/gui/gnome-cal.c:1
-#: calendar/gui/gnome-cal.c:1
+#: 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 "Otwieranie zada� z %s"
 
-#: calendar/gui/e-tasks.c:1 calendar/gui/tasks-control.c:1
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nie mo�na wczyta� zadania w \"%s\""
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana"
 
-#: calendar/gui/e-tasks.c:1 calendar/gui/gnome-cal.c:1
+#: 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 "Nie mo�na otworzy� folderu w \"%s\""
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "B��d przy uruchamianiu %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:563
 msgid "Deleting selected objects..."
 msgstr "Usuwanie zaznaczonych obiekt�w..."
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
-#: calendar/gui/e-week-view.c:1
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1524
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie mo�na otworzy� folderu w \"%s\""
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1535
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda wymagana do otwarcia \"%s\" nie jest obs�ugiwana"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1575
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm o %s"
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5734,7 +5794,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5742,12 +5802,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otwieranie kalendarza z %s"
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:2029
 msgid "Opening default tasks folder"
 msgstr "Otwieranie domy�lnego folderu zada�"
 
@@ -5755,357 +5815,367 @@ msgstr "Otwieranie domy�lnego folderu zada�"
 msgid "April"
 msgstr "Kwiecie�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "Sierpie�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "Grudzie�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Luty"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:5
 msgid "Go To Date"
 msgstr "Przej�cie do daty"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "Go To Today"
 msgstr "Przejd� do dzi�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Stycze�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Lipiec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Czerwiec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Marzec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Maj"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Listopad"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Pa�dziernik"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "Wrzesie�"
 
-#: calendar/gui/itip-utils.c:1
-msgid "At least one attendee is necessary"
-msgstr "Wymagany jest co najmniej jeden uczestnik"
-
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
 msgid "An organizer must be set."
 msgstr "Nale�y poda� organizatora."
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Wymagany jest co najmniej jeden uczestnik"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Informacja o spotkaniu"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Informacja o zadaniu"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Informacja dziennika"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Informacja o zaj�to�ci"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Informacja kalendarza"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr "Aktualizacja"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr "Od�wie�"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr "Kontrpropozycja"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:596
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Informacja o zaj�to�ci"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "Informacja kalendarza"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Musisz nale�e� do uczestnik�w zdarzenia."
 
-#: calendar/gui/main.c:1
+#: calendar/gui/main.c:70
 msgid "Could not activate Bonobo"
 msgstr "Nie mo�na uaktywni� Bonobo"
 
-#: calendar/gui/main.c:1
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Nie mo�na utworzy� generatora komponentu edytora"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "Ni"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Wt"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "�r"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Cz"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Pt"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Wybrany dzie� dzie� (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
+#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
+#: calendar/gui/print.c:1896
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Wybrany tydzie� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Wybrany miesi�c (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Wybrany rok (%Y)"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2249
 msgid "Task"
 msgstr "Zadanie"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2306
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2324
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorytet: %s"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent zako�czenia: %i"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2364
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorie: %s"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2375
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Wydrukuj kalendarz"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
-#: calendar/gui/tasks-control.c:1 mail/mail-callbacks.c:1
-#: my-evolution/e-summary.c:1
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Podgl�d wydruku"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Wydruk elementu"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
-#: calendar/gui/tasks-control-factory.c:1
+#: calendar/gui/tasks-control-factory.c:75
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie mo�na utworzy� widoku zada�.  Zweryfikuj ustawienia ORBita i OAF-a."
 
-#: calendar/gui/tasks-control.c:1
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "URI folderu zada�, kt�ry nale�y wy�wietli�"
 
-#: calendar/gui/tasks-control.c:1
+#: calendar/gui/tasks-control.c:462
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6119,16 +6189,16 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: calendar/gui/tasks-control.c:1 mail/mail-callbacks.c:1
-#: mail/mail-callbacks.c:1
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "Bez pytania o to w przysz�o�ci."
 
-#: calendar/gui/tasks-control.c:1
+#: calendar/gui/tasks-control.c:618
 msgid "Print Tasks"
 msgstr "Wydruku zada�"
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -6136,7 +6206,7 @@ msgstr ""
 "Zadania umieszczone w folderze kalendarza zosta�y przez Evolution "
 "automatycznie przeniesione do nowego folderu zada�."
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -6148,7 +6218,7 @@ msgstr ""
 "Niekt�re z zada� nie mog�y zosta� przeniesione, wi�c proces mo�e si� w "
 "przysz�o�ci powt�rzy�."
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -6157,7 +6227,7 @@ msgstr ""
 "Nie mo�na otworzy� `%s'; �aden z element�w folderu kalendarza nie zosta� "
 "przeniesiony do folderu zada�."
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -6166,7 +6236,7 @@ msgstr ""
 "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana. Nie przeniesiono "
 "�adnych element�w z folderu kalendarza do folderu zada�."
 
-#: calendar/gui/weekday-picker.c:1 calendar/gui/weekday-picker.c:1
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "NPW�CPS"
 
@@ -6174,35 +6244,35 @@ msgstr "NPW�CPS"
 msgid "Factory to import iCalendar files into Evolution"
 msgstr "Generator importu plik�w iCalendar do Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
 msgid "Imports iCalendar files into Evolution"
 msgstr "Importuje pliki iCalendar do Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importuje pliki vCalendar do Evolution"
 
-#: calendar/importers/icalendar-importer.c:1
+#: calendar/importers/icalendar-importer.c:168
 #, fuzzy, c-format
 msgid "Can't get storage list from registry: %s"
 msgstr ""
 "Nie mo�na pobra� listu: %s z folderu %s\n"
 "  %s"
 
-#: calendar/importers/icalendar-importer.c:1
+#: calendar/importers/icalendar-importer.c:180
 #, fuzzy, c-format
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Nie mo�na nawi�za� po��czenia z miejscem przechowywania: %s"
 
-#: calendar/importers/icalendar-importer.c:1
+#: calendar/importers/icalendar-importer.c:483
 msgid "Reminder!!"
 msgstr "Przypomnienie!!"
 
-#: calendar/importers/icalendar-importer.c:1
+#: calendar/importers/icalendar-importer.c:697
 msgid "Calendar Events"
 msgstr "Zdarzenia kalendarza"
 
-#: calendar/importers/icalendar-importer.c:1
+#: calendar/importers/icalendar-importer.c:722
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6210,104 +6280,104 @@ msgstr ""
 "Odnaleziono pliki kalendarza GNOME.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:1
+#: calendar/importers/icalendar-importer.c:729
 msgid "Gnome Calendar"
 msgstr "Kalendarz GNOME"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "time-now wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time wymaga, �eby 1. argument by� napisem"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "make-time wymaga, aby 1. argument by� napisem z dat�/czasem w formacie ISO "
 "8601"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day wymaga 2 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 "time-add-day wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day wymaga, aby 2. argument by� liczb� ca�kowit�"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 "time-day-begin wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 "time-day-end wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? wymaga 2 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 "occur-in-time-range? wymaga, aby 1. argument by� liczb� okre�laj�c� czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 "occur-in-time-range? wymaga, aby 2. argument by� liczb� okre�laj�c� czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? wymaga 2 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? wymaga, �eby 1. argument by� napisem"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? wymaga, �eby 2. argument by� napisem"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:734
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
-"contains? wymaga, �eby 1. argument mia� jedn� z warto�ci: \"any\", "
-"\"summary\", \"description\""
+"contains? wymaga, �eby 1. argument mia� jedn� z warto�ci: \"any\", \"summary"
+"\", \"description\""
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? wymaga co najmniej 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:788
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6315,1582 +6385,1587 @@ msgstr ""
 "has-categories? wymaga, �eby wszystkie argumenty by�y napisami, lub �eby "
 "podany by� dok�adnie jeden argument, b�d�cy fa�szem logicznym (#f)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 "completed-before? wymaga, aby 1. argument by� liczb� okre�laj�c� czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Przetworzenie wyra�enia wyszukiwania nie da�o warto�ci logicznej"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "b��d sk�adniowy"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: calendar/zones.h:1
+#: calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Africa/Abidjan"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:8
 msgid "Africa/Accra"
 msgstr "Africa/Accra"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
 msgstr "Africa/Addis_Ababa"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:10
 msgid "Africa/Algiers"
 msgstr "Africa/Algiers"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:11
 msgid "Africa/Asmera"
 msgstr "Africa/Asmera"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:12
 msgid "Africa/Bamako"
 msgstr "Africa/Bamako"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:13
 msgid "Africa/Bangui"
 msgstr "Africa/Bangui"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:14
 msgid "Africa/Banjul"
 msgstr "Africa/Banjul"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:15
 msgid "Africa/Bissau"
 msgstr "Africa/Bissau"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:16
 msgid "Africa/Blantyre"
 msgstr "Africa/Blantyre"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:17
 msgid "Africa/Brazzaville"
 msgstr "Africa/Brazzaville"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:18
 msgid "Africa/Bujumbura"
 msgstr "Africa/Bujumbura"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:19
 msgid "Africa/Cairo"
 msgstr "Africa/Cairo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:20
 msgid "Africa/Casablanca"
 msgstr "Africa/Casablanca"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:21
 msgid "Africa/Ceuta"
 msgstr "Africa/Ceuta"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:22
 msgid "Africa/Conakry"
 msgstr "Africa/Conakry"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:23
 msgid "Africa/Dakar"
 msgstr "Africa/Dakar"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
 msgstr "Africa/Dar_es_Salaam"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:25
 msgid "Africa/Djibouti"
 msgstr "Africa/Djibouti"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:26
 msgid "Africa/Douala"
 msgstr "Africa/Douala"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:27
 msgid "Africa/El_Aaiun"
 msgstr "Africa/El_Aaiun"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:28
 msgid "Africa/Freetown"
 msgstr "Africa/Freetown"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:29
 msgid "Africa/Gaborone"
 msgstr "Africa/Gaborone"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:30
 msgid "Africa/Harare"
 msgstr "Africa/Harare"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:31
 msgid "Africa/Johannesburg"
 msgstr "Africa/Johannesburg"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:32
 msgid "Africa/Kampala"
 msgstr "Africa/Kampala"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:33
 msgid "Africa/Khartoum"
 msgstr "Africa/Khartoum"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:34
 msgid "Africa/Kigali"
 msgstr "Africa/Kigali"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:35
 msgid "Africa/Kinshasa"
 msgstr "Africa/Kinshasa"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:36
 msgid "Africa/Lagos"
 msgstr "Africa/Lagos"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:37
 msgid "Africa/Libreville"
 msgstr "Africa/Libreville"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:38
 msgid "Africa/Lome"
 msgstr "Africa/Lome"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:39
 msgid "Africa/Luanda"
 msgstr "Africa/Luanda"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:40
 msgid "Africa/Lubumbashi"
 msgstr "Africa/Lubumbashi"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:41
 msgid "Africa/Lusaka"
 msgstr "Africa/Lusaka"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:42
 msgid "Africa/Malabo"
 msgstr "Africa/Malabo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:43
 msgid "Africa/Maputo"
 msgstr "Africa/Maputo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:44
 msgid "Africa/Maseru"
 msgstr "Africa/Maseru"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:45
 msgid "Africa/Mbabane"
 msgstr "Africa/Mbabane"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:46
 msgid "Africa/Mogadishu"
 msgstr "Africa/Mogadishu"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:47
 msgid "Africa/Monrovia"
 msgstr "Africa/Monrovia"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:48
 msgid "Africa/Nairobi"
 msgstr "Africa/Nairobi"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:49
 msgid "Africa/Ndjamena"
 msgstr "Africa/Ndjamena"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:50
 msgid "Africa/Niamey"
 msgstr "Africa/Niamey"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:51
 msgid "Africa/Nouakchott"
 msgstr "Africa/Nouakchott"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:52
 msgid "Africa/Ouagadougou"
 msgstr "Africa/Ouagadougou"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:53
 msgid "Africa/Porto-Novo"
 msgstr "Africa/Porto-Novo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:54
 msgid "Africa/Sao_Tome"
 msgstr "Africa/Sao_Tome"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:55
 msgid "Africa/Timbuktu"
 msgstr "Africa/Timbuktu"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:56
 msgid "Africa/Tripoli"
 msgstr "Africa/Tripoli"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:57
 msgid "Africa/Tunis"
 msgstr "Africa/Tunis"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:58
 msgid "Africa/Windhoek"
 msgstr "Africa/Windhoek"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:59
 msgid "America/Adak"
 msgstr "America/Adak"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:60
 msgid "America/Anchorage"
 msgstr "America/Anchorage"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:61
 msgid "America/Anguilla"
 msgstr "America/Anguilla"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:62
 msgid "America/Antigua"
 msgstr "America/Antigua"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:63
 msgid "America/Araguaina"
 msgstr "America/Araguaina"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:64
 msgid "America/Aruba"
 msgstr "America/Aruba"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:65
 msgid "America/Asuncion"
 msgstr "America/Asuncion"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:66
 msgid "America/Barbados"
 msgstr "America/Barbados"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:67
 msgid "America/Belem"
 msgstr "America/Belem"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:68
 msgid "America/Belize"
 msgstr "America/Belize"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:69
 msgid "America/Boa_Vista"
 msgstr "America/Boa_Vista"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:70
 msgid "America/Bogota"
 msgstr "America/Bogota"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:71
 msgid "America/Boise"
 msgstr "America/Boise"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:72
 msgid "America/Buenos_Aires"
 msgstr "America/Buenos_Aires"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:73
 msgid "America/Cambridge_Bay"
 msgstr "America/Cambridge_Bay"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:74
 msgid "America/Cancun"
 msgstr "America/Cancun"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:75
 msgid "America/Caracas"
 msgstr "America/Caracas"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:76
 msgid "America/Catamarca"
 msgstr "America/Catamarca"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:77
 msgid "America/Cayenne"
 msgstr "America/Cayenne"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:78
 msgid "America/Cayman"
 msgstr "America/Cayman"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:79
 msgid "America/Chicago"
 msgstr "America/Chicago"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:80
 msgid "America/Chihuahua"
 msgstr "America/Chihuahua"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:81
 msgid "America/Cordoba"
 msgstr "America/Cordoba"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:82
 msgid "America/Costa_Rica"
 msgstr "America/Costa_Rica"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:83
 msgid "America/Cuiaba"
 msgstr "America/Cuiaba"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:84
 msgid "America/Curacao"
 msgstr "America/Curacao"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:85
 msgid "America/Danmarkshavn"
 msgstr "America/Danmarkshavn"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:86
 msgid "America/Dawson"
 msgstr "America/Dawson"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:87
 msgid "America/Dawson_Creek"
 msgstr "America/Dawson_Creek"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:88
 msgid "America/Denver"
 msgstr "America/Denver"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:89
 msgid "America/Detroit"
 msgstr "America/Detroit"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:90
 msgid "America/Dominica"
 msgstr "America/Dominica"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:91
 msgid "America/Edmonton"
 msgstr "America/Edmonton"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:92
 msgid "America/Eirunepe"
 msgstr "America/Eirunepe"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:93
 msgid "America/El_Salvador"
 msgstr "America/El_Salvador"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:94
 msgid "America/Fortaleza"
 msgstr "America/Fortaleza"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:95
 msgid "America/Glace_Bay"
 msgstr "America/Glace_Bay"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:96
 msgid "America/Godthab"
 msgstr "America/Godthab"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:97
 msgid "America/Goose_Bay"
 msgstr "America/Goose_Bay"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:98
 msgid "America/Grand_Turk"
 msgstr "America/Grand_Turk"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:99
 msgid "America/Grenada"
 msgstr "America/Grenada"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:100
 msgid "America/Guadeloupe"
 msgstr "America/Guadeloupe"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:101
 msgid "America/Guatemala"
 msgstr "America/Guatemala"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:102
 msgid "America/Guayaquil"
 msgstr "America/Guayaquil"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:103
 msgid "America/Guyana"
 msgstr "America/Guyana"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:104
 msgid "America/Halifax"
 msgstr "America/Halifax"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:105
 msgid "America/Havana"
 msgstr "America/Havana"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:106
 msgid "America/Hermosillo"
 msgstr "America/Hermosillo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
 msgstr "America/Indiana/Indianapolis"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:108
 msgid "America/Indiana/Knox"
 msgstr "America/Indiana/Knox"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:109
 msgid "America/Indiana/Marengo"
 msgstr "America/Indiana/Marengo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:110
 msgid "America/Indiana/Vevay"
 msgstr "America/Indiana/Vevay"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:111
 msgid "America/Indianapolis"
 msgstr "America/Indianapolis"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:112
 msgid "America/Inuvik"
 msgstr "America/Inuvik"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:113
 msgid "America/Iqaluit"
 msgstr "America/Iqaluit"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:114
 msgid "America/Jamaica"
 msgstr "America/Jamaica"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:115
 msgid "America/Jujuy"
 msgstr "America/Jujuy"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:116
 msgid "America/Juneau"
 msgstr "America/Juneau"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
 msgstr "America/Kentucky/Louisville"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
 msgstr "America/Kentucky/Monticello"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:119
 msgid "America/La_Paz"
 msgstr "America/La_Paz"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:120
 msgid "America/Lima"
 msgstr "America/Lima"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:121
 msgid "America/Los_Angeles"
 msgstr "America/Los_Angeles"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:122
 msgid "America/Louisville"
 msgstr "America/Louisville"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:123
 msgid "America/Maceio"
 msgstr "America/Maceio"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:124
 msgid "America/Managua"
 msgstr "America/Managua"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:125
 msgid "America/Manaus"
 msgstr "America/Manaus"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:126
 msgid "America/Martinique"
 msgstr "America/Martinique"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:127
 msgid "America/Mazatlan"
 msgstr "America/Mazatlan"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:128
 msgid "America/Mendoza"
 msgstr "America/Mendoza"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:129
 msgid "America/Menominee"
 msgstr "America/Menominee"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:130
 msgid "America/Merida"
 msgstr "America/Merida"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:131
 msgid "America/Mexico_City"
 msgstr "America/Mexico_City"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:132
 msgid "America/Miquelon"
 msgstr "America/Miquelon"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:133
 msgid "America/Monterrey"
 msgstr "America/Monterrey"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:134
 msgid "America/Montevideo"
 msgstr "America/Montevideo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:135
 msgid "America/Montreal"
 msgstr "America/Montreal"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:136
 msgid "America/Montserrat"
 msgstr "America/Montserrat"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:137
 msgid "America/Nassau"
 msgstr "America/Nassau"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:138
 msgid "America/New_York"
 msgstr "America/New_York"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:139
 msgid "America/Nipigon"
 msgstr "America/Nipigon"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:140
 msgid "America/Nome"
 msgstr "America/Nome"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:141
 msgid "America/Noronha"
 msgstr "America/Noronha"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:142
 msgid "America/North_Dakota/Center"
 msgstr "America/North_Dakota/Center"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:143
 msgid "America/Panama"
 msgstr "America/Panama"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:144
 msgid "America/Pangnirtung"
 msgstr "America/Pangnirtung"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:145
 msgid "America/Paramaribo"
 msgstr "America/Paramaribo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:146
 msgid "America/Phoenix"
 msgstr "America/Phoenix"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:147
 msgid "America/Port-au-Prince"
 msgstr "America/Port-au-Prince"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:148
 msgid "America/Port_of_Spain"
 msgstr "America/Port_of_Spain"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:149
 msgid "America/Porto_Velho"
 msgstr "America/Porto_Velho"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:150
 msgid "America/Puerto_Rico"
 msgstr "America/Puerto_Rico"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:151
 msgid "America/Rainy_River"
 msgstr "America/Rainy_River"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:152
 msgid "America/Rankin_Inlet"
 msgstr "America/Rankin_Inlet"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:153
 msgid "America/Recife"
 msgstr "America/Recife"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:154
 msgid "America/Regina"
 msgstr "America/Regina"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:155
 msgid "America/Rio_Branco"
 msgstr "America/Rio_Branco"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:156
 msgid "America/Rosario"
 msgstr "America/Rosario"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:157
 msgid "America/Santiago"
 msgstr "America/Santiago"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:158
 msgid "America/Santo_Domingo"
 msgstr "America/Santo_Domingo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:159
 msgid "America/Sao_Paulo"
 msgstr "America/Sao_Paulo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:160
 msgid "America/Scoresbysund"
 msgstr "America/Scoresbysund"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:161
 msgid "America/Shiprock"
 msgstr "America/Shiprock"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:162
 msgid "America/St_Johns"
 msgstr "America/St_Johns"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:163
 msgid "America/St_Kitts"
 msgstr "America/St_Kitts"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:164
 msgid "America/St_Lucia"
 msgstr "America/St_Lucia"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:165
 msgid "America/St_Thomas"
 msgstr "America/St_Thomas"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:166
 msgid "America/St_Vincent"
 msgstr "America/St_Vincent"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:167
 msgid "America/Swift_Current"
 msgstr "America/Swift_Current"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:168
 msgid "America/Tegucigalpa"
 msgstr "America/Tegucigalpa"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:169
 msgid "America/Thule"
 msgstr "America/Thule"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:170
 msgid "America/Thunder_Bay"
 msgstr "America/Thunder_Bay"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:171
 msgid "America/Tijuana"
 msgstr "America/Tijuana"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:172
 msgid "America/Tortola"
 msgstr "America/Tortola"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:173
 msgid "America/Vancouver"
 msgstr "America/Vancouver"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:174
 msgid "America/Whitehorse"
 msgstr "America/Whitehorse"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:175
 msgid "America/Winnipeg"
 msgstr "America/Winnipeg"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:176
 msgid "America/Yakutat"
 msgstr "America/Yakutat"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:177
 msgid "America/Yellowknife"
 msgstr "America/Yellowknife"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:178
 msgid "Antarctica/Casey"
 msgstr "Antarctica/Casey"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:179
 msgid "Antarctica/Davis"
 msgstr "Antarctica/Davis"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarctica/DumontDUrville"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:181
 msgid "Antarctica/Mawson"
 msgstr "Antarctica/Mawson"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:182
 msgid "Antarctica/McMurdo"
 msgstr "Antarctica/McMurdo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:183
 msgid "Antarctica/Palmer"
 msgstr "Antarctica/Palmer"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:184
 msgid "Antarctica/South_Pole"
 msgstr "Antarctica/South_Pole"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:185
 msgid "Antarctica/Syowa"
 msgstr "Antarctica/Syowa"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:186
 msgid "Antarctica/Vostok"
 msgstr "Antarctica/Vostok"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
 msgstr "Arctic/Longyearbyen"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:188
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:189
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:190
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:191
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:192
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:193
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:194
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:195
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:196
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:197
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:198
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:199
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:200
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:201
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:202
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:203
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:204
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongqing"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:205
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:206
 msgid "Asia/Damascus"
 msgstr "Asia/Damascus"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:207
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:208
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:209
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:210
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:211
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:212
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:213
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:214
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:215
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:216
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:217
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:218
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:219
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:220
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:221
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:222
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:223
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:224
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:227
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:228
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:229
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:230
 msgid "Asia/Macau"
 msgstr ""
 
-#: calendar/zones.h:1
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:232
 msgid "Asia/Makassar"
 msgstr ""
 
-#: calendar/zones.h:1
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:238
 msgid "Asia/Oral"
 msgstr ""
 
-#: calendar/zones.h:1
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:243
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantic/Azores"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantic/Bermuda"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantic/Canary"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantic/Cape_Verde"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantic/Faeroe"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantic/Jan_Mayen"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantic/Madeira"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantic/Reykjavik"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantic/South_Georgia"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantic/St_Helena"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantic/Stanley"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europe/Amsterdam"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europe/Andorra"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europe/Athens"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europe/Belfast"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europe/Belgrade"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europe/Berlin"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europe/Bratislava"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europe/Brussels"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europe/Bucharest"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europe/Budapest"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europe/Chisinau"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europe/Copenhagen"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europe/Dublin"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europe/Gibraltar"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europe/Helsinki"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europe/Istanbul"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europe/Kaliningrad"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europe/Kiev"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europe/Lisbon"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europe/Ljubljana"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europe/London"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europe/Luxembourg"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europe/Madrid"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europe/Malta"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europe/Minsk"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europe/Monaco"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europe/Moscow"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europe/Nicosia"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europe/Oslo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europe/Paris"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europe/Prague"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europe/Riga"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europe/Rome"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europe/Samara"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europe/San_Marino"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europe/Sarajevo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europe/Simferopol"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europe/Skopje"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europe/Sofia"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europe/Stockholm"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europe/Tallinn"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europe/Tirane"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europe/Uzhgorod"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europe/Vaduz"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europe/Vatican"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europe/Vienna"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europe/Vilnius"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europe/Warsaw"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europe/Zagreb"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozhye"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europe/Zurich"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indian/Antananarivo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indian/Chagos"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indian/Christmas"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indian/Cocos"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indian/Comoro"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indian/Kerguelen"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indian/Mahe"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indian/Maldives"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indian/Mauritius"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indian/Mayotte"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indian/Reunion"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pacific/Apia"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pacific/Auckland"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pacific/Chatham"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pacific/Easter"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pacific/Efate"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pacific/Enderbury"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pacific/Fakaofo"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pacific/Fiji"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pacific/Funafuti"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pacific/Galapagos"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pacific/Gambier"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pacific/Guadalcanal"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pacific/Guam"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pacific/Honolulu"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pacific/Johnston"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pacific/Kiritimati"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pacific/Kosrae"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pacific/Kwajalein"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pacific/Majuro"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pacific/Marquesas"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pacific/Midway"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pacific/Nauru"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pacific/Niue"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pacific/Norfolk"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pacific/Noumea"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pacific/Pago_Pago"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pacific/Palau"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pacific/Pitcairn"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pacific/Ponape"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pacific/Port_Moresby"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pacific/Rarotonga"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pacific/Saipan"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pacific/Tahiti"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pacific/Tarawa"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pacific/Tongatapu"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pacific/Truk"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pacific/Wake"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pacific/Wallis"
 
-#: calendar/zones.h:1
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje podpisywania"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje weryfikacji"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje kodowania"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje rozkodowywania"
 
-#: camel/camel-data-cache.c:1
+#: camel/camel-data-cache.c:169
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "Nie mo�na utworzy� pliku wyj�ciowego: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:1
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nie mo�na otworzy� katalogu cache: %s"
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7901,7 +7976,7 @@ msgstr ""
 "Kolejne operacje na tym serwerze nie b�d� mog�y zosta� odtworzone\n"
 "po ponownym pod��czeniu do sieci."
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7912,97 +7987,97 @@ msgstr ""
 "%s\n"
 "Zmiany w tym folderze nie zostan� zsynchronizowane z serwerem."
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Ponowne synchronizowanie z serwerem"
 
-#: camel/camel-disco-folder.c:1
+#: camel/camel-disco-folder.c:278
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Przygotowywanie folderu \"%s\" do pracy bez pod��czenia"
 
-#: camel/camel-disco-store.c:1
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Do zako�czenia tej operacji konieczne jest po��czenie z sieci�"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Synchronizowanie folder�w"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "B��d przy analizie sk�adni filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "B��d przy wykonywaniu filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Nie mo�na otworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Nie mo�na przetworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Pobieranie %d. listu (%d%%)"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "Niepowodzenie przy %d. li�cie"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Pobieranie %d. listu z %d"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Niepowodzenie przy li�cie %d z %d"
 
-#: camel/camel-filter-search.c:1
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Nie mo�na pobra� listu"
 
-#: camel/camel-filter-search.c:1
+#: camel/camel-filter-search.c:387
 msgid "Invalid arguments to (system-flag)"
 msgstr "Niepoprawne argumenty funkcji (system-flag)"
 
-#: camel/camel-filter-search.c:1
+#: camel/camel-filter-search.c:402
 msgid "Invalid arguments to (user-tag)"
 msgstr "Niepoprawne argumenty funkcji (user-tag)"
 
-#: camel/camel-filter-search.c:1
+#: camel/camel-filter-search.c:514
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nie mo�na utworzy� potoku do \"%s\": %s"
 
-#: camel/camel-filter-search.c:1
+#: camel/camel-filter-search.c:550
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nie mo�na utworzy� procesu potomnego \"%s\": %s"
 
-#: camel/camel-filter-search.c:1 camel/camel-filter-search.c:1
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "B��d przy wykonywaniu wyszukiwania przez filtr: %s: %s"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8011,7 +8086,7 @@ msgstr ""
 "B��d w wyra�eniu wyszukiwania: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8020,39 +8095,39 @@ msgstr ""
 "B��d przy wykonywaniu wyra�enia wyszukiwania %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:1 camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) wymaga pojedynczego wyniku logicznego"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Wykonywanie zapytania na nieznanym nag��wku: %s"
 
-#: camel/camel-folder.c:1
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nieobs�ugiwana operacja: do��czenie listu: typ %s"
 
-#: camel/camel-folder.c:1
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nieobs�ugiwana operacja: wyszukiwanie wed�ug wyra�enia: typ %s"
 
-#: camel/camel-folder.c:1
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nieobs�ugiwana operacja: wyszukiwanie wed�ug uid: dla %s"
 
-#: camel/camel-folder.c:1
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Przenoszenie list�w"
 
-#: camel/camel-folder.c:1
+#: camel/camel-folder.c:1319
 msgid "Copying messages"
 msgstr "Kopiowanie list�w"
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:713
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8060,46 +8135,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:727
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:750
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:758
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:1 camel/camel-gpg-context.c:1
-#: camel/camel-gpg-context.c:1 camel/camel-gpg-context.c:1
-#: camel/camel-gpg-context.c:1 mail/mail-send-recv.c:1
+#: camel/camel-gpg-context.c:769 camel/camel-gpg-context.c:1228
+#: camel/camel-gpg-context.c:1336 camel/camel-gpg-context.c:1411
+#: camel/camel-gpg-context.c:1469 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:787
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:793
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nieoczekiwana odpowied� od programu GnuPG: %s"
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:803
 msgid "No data provided"
 msgstr "Nie podano danych"
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:848
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie mo�na zaszyfrowa� listu: nie podano odbiorc�w"
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:1103
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8107,176 +8182,176 @@ msgid ""
 "%.*s"
 msgstr "Nie mo�na zapisa� listu %s w cache: %s"
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:1109
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nie mo�na zapisa� listu %s w cache: %s"
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:1219
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nie mo�na uruchomi� gpg: %s"
 
-#: camel/camel-gpg-context.c:1 camel/camel-gpg-context.c:1
-#: camel/camel-gpg-context.c:1 camel/camel-gpg-context.c:1
-#: camel/camel-gpg-context.c:1 camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:1249 camel/camel-gpg-context.c:1328
+#: camel/camel-gpg-context.c:1402 camel/camel-gpg-context.c:1432
+#: camel/camel-gpg-context.c:1460 camel/camel-gpg-context.c:1490
 msgid "Failed to execute gpg."
 msgstr "Nie mo�na uruchomi� gpg."
 
-#: camel/camel-gpg-context.c:1
+#: camel/camel-gpg-context.c:1313
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Nie mo�na zweryfikowa� podpisu listu: nie mo�na utworzy� pliku tymczasowego: "
 "%s"
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Nie mo�na utworzy� potoku do pomocniczego programu blokuj�cego: %s"
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Nie mo�na utworzy� procesu dla pomocniczego programu blokuj�cego: %s"
 
-#: camel/camel-lock-client.c:1 camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 "Nie mo�na zablokowa� \"%s\": b��d przy komuniacji z programem blokuj�cym"
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Nie mo�na zablokowa� \"%s\""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:1 camel/camel-lock.c:1
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nie mo�na utworzy� pliku blokady dla %s: %s"
 
-#: camel/camel-lock.c:1
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Up�yn�� czas przeznaczony na uzyskanie blokady pliku %s. Spr�buj ponownie "
 "p�niej."
 
-#: camel/camel-lock.c:1
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Uzyskanie blokady za pomoc� fcntl(2) nie powiod�o si�: %s"
 
-#: camel/camel-lock.c:1
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Uzyskanie blokady za pomoc� flock(2) nie powiod�o si�: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nie mo�na sprawdzi� pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nie mo�na otworzy� pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nie mo�na otworzy� tymczasowego pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Zapisanie listu w pliku tymczasowym %s nie powiod�o si�: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Utworzenie potoku nie powiod�o si�: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nie mo�na utworzy� procesu: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "B��d programu przesy�aj�cego poczt�: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Nieznany b��d)"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "B��d przy odczycie pliku z listem: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "B��d przy zapisie do tymczasowego pliku z listami: %s"
 
-#: camel/camel-movemail.c:1 camel/camel-movemail.c:1
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "B��d przy kopiowaniu tymczasowego pliku z listami: %s"
 
-#: camel/camel-multipart-encrypted.c:1 camel/camel-multipart-encrypted.c:1
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:1
+#: camel/camel-multipart-encrypted.c:287
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:1
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:1
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "To jest cz�� listu podpisana cyfrowo"
 
-#: camel/camel-multipart-signed.c:1
+#: camel/camel-multipart-signed.c:678
 msgid "parse error"
 msgstr "b��d sk�adniowy"
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nie mo�na za�adowa� %s: System nie obs�uguje �adowania modu��w."
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie mo�na wczyta� %s: %s"
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie mo�na wczyta� %s: Brak kodu inicjuj�cego w module."
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonimowy"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
 msgstr ""
 "Przy tej opcji ��czenie z serwerem nast�pi przy u�yciu anonimowego konta."
 
-#: camel/camel-sasl-anonymous.c:1 camel/camel-sasl-plain.c:1
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Uwierzytelnienie nie powiod�o si�."
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -8285,7 +8360,7 @@ msgstr ""
 "Niepoprawne informacje identyfikuj�ce poprzez adres e-mail:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -8294,7 +8369,7 @@ msgstr ""
 "Niepoprawne nieprzejrzyste informacje identyfikuj�ce:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -8303,11 +8378,11 @@ msgstr ""
 "Niepoprawne informacje identyfikuj�ce:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:1
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:1
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -8315,11 +8390,11 @@ msgstr ""
 "Przy tej opcji po��czenie z serwerem nast�pi przy u�yciu has�a CRAM-MD5, o "
 "ile b�dzie ono obs�ugiwane przez serwer."
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:45
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8327,43 +8402,43 @@ msgstr ""
 "Przy tej opcji po��czenie z serwerem nast�pi przy u�yciu has�a DIGEST-MD5, o "
 "ile b�dzie ono obs�ugiwane przez serwer."
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Zbyt d�ugie wezwanie serwera (>2048 oktet�w)\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr "Niepoprawne wezwanie serwera\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"Wezwanie serwera zawiera�o niepoprawny token \"Quality of Protection\" "
-"(jako�� ochrony)\n"
+"Wezwanie serwera zawiera�o niepoprawny token \"Quality of Protection"
+"\" (jako�� ochrony)\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr "Odpowied� serwera nie zawiera danych o autoryzacji\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Odpowied� serwera zawiera niekompletne dane o autoryzacji\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr "Niepotwierdzona odpowied� serwera\n"
 
-#: camel/camel-sasl-kerberos4.c:1
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:1
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Opcja ta spowoduje ��czenie z serwerem przy wykorzystaniu uwierzytelniania "
 "Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:1
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8372,31 +8447,31 @@ msgstr ""
 "Nie mo�na pobra� biletu Kerberosa:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:1
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
-#: camel/camel-sasl-login.c:1
+#: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
 msgstr "Logowanie NT"
 
-#: camel/camel-sasl-login.c:1 camel/camel-sasl-plain.c:1
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Przy tej opcji po��czenie z serwerem nast�pi przy u�yciu has�a w postaci "
 "czystego tekstu."
 
-#: camel/camel-sasl-login.c:1
+#: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
 msgstr "Nieznany stan uwierzytelnienia."
 
-#: camel/camel-sasl-ntlm.c:1
+#: camel/camel-sasl-ntlm.c:31
 msgid "NTLM / SPA"
 msgstr ""
 
-#: camel/camel-sasl-ntlm.c:1
+#: camel/camel-sasl-ntlm.c:33
 #, fuzzy
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
@@ -8405,99 +8480,99 @@ msgstr ""
 "Opcja ta spowoduje ��czenie z serwerem przy wykorzystaniu uwierzytelniania "
 "Kerberos 4."
 
-#: camel/camel-sasl-plain.c:1
+#: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr "POP przed SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 "Ta opcja spowoduje uwierzytelnienie po��czenia POP przed wykorzystaniem SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr "URI �r�d�a POP"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "Uwierzytelnianie POP przed SMTP z u�yciem nieznanego transportu"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP przed SMTP przy u�yciu �r�d�a nie b�d�cego typu pop"
 
-#: camel/camel-search-private.c:1
+#: camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nie powiod�a si� kompilacja wyra�enia regularnego: %s: %s"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa u�ytkownika"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa komputera"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "W URL-u \"%s\" wymagana jest �cie�ka"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Wyszukiwanie: %s"
 
-#: camel/camel-service.c:1 camel/camel-service.c:1
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s: nazwa nie istnieje"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s: przyczyna nieznana"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Wyszukiwanie adresu"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:913
 msgid "Host lookup failed: host not found"
 msgstr "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: nazwa nie istnieje"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:916
 msgid "Host lookup failed: unknown reason"
 msgstr "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: przyczyna nieznana"
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Dostarczyciel poczty dla folder�w wirtualnych"
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Do odczytu poczty jako zapytania na innym zbiorze folder�w"
 
-#: camel/camel-session.c:1 camel/camel-session.c:1
+#: camel/camel-session.c:351 camel/camel-session.c:419
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Brak dostarczyciela dla protoko�u \"%s\""
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:545
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8506,178 +8581,178 @@ msgstr ""
 "Nie mo�na utworzy� katalogu %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:173
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "Podaj swoje has�o dla %s"
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 "Wybierz przydomek zwi�zany z certyfikatem, kt�rego chcesz u�y� do podpisu."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:209
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Certyfikat podpisu dla \"%s\" nie istnieje."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:249
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Certyfikat szyfruj�cy dla \"%s\" nie istnieje."
 
-#: camel/camel-smime-context.c:1 camel/camel-smime-context.c:1
-#: camel/camel-smime-context.c:1 camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Nie mo�na odnale�� certyfikatu dla \"%s\"."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:556
 msgid "Failed to find a common bulk algorithm."
 msgstr "Nie mo�na odnale�� wsp�lnego algorytmu gromadz�cego."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:810
 msgid "Failed to decode message."
 msgstr "Nie mo�na odkodowa� listu."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:855
 msgid "Failed to verify certificates."
 msgstr "Nie mo�na zweryfikowa� certyfikatu."
 
-#: camel/camel-store.c:1
+#: camel/camel-store.c:244
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nie mo�na pobra� folderu: Niepoprawna operacja na tym miejscu przechowywania"
 
-#: camel/camel-store.c:1
+#: camel/camel-store.c:306
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nie mo�na utworzy� folderu: Niepoprawna operacja na tym miejscu "
 "przechowywania"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:566
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Nie mo�na zweryfikowa� certyfikatu."
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to decrypt certificate signature"
 msgstr "Nie mo�na rozszyfrowa� podpisu certyfikatu"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:576
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Nie mo�na zapisa� pliku z podpisem."
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate not yet valid"
 msgstr "Certyfikat nie jest jeszcze wa�ny"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate has expired"
 msgstr "Certyfikat uleg� przedawnieniu"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:591
 #, fuzzy
 msgid "Error in CRL"
 msgstr "B��d przy odczycie %s"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:593
 msgid "Out of memory"
 msgstr "Brak pami�ci"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:601
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "Nie mo�na zweryfikowa� certyfikatu."
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:605
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "ID _certyfikatu:"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Invalid purpose"
 msgstr "Nieznana przyczyna"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:613
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "ID _certyfikatu:"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate rejected"
 msgstr "Certyfikat odrzucony"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1 camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8686,15 +8761,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1 camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1 camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:702
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8712,7 +8787,7 @@ msgstr ""
 "Czy pomimo tego chcesz go zaakceptowa�?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-ssl.c:535
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8727,122 +8802,122 @@ msgstr ""
 "\n"
 "Czy pomimo tego chcesz go zaakceptowa�?"
 
-#: camel/camel-url.c:1
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nie mo�na rozpozna� URL-a \"%s\""
 
-#: camel/camel-vee-folder.c:1
+#: camel/camel-vee-folder.c:618
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "B��d przy uruchamianiu %s"
 
-#: camel/camel-vee-folder.c:1
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Brak listu %s w %s."
 
-#: camel/camel-vee-folder.c:1 camel/camel-vee-folder.c:1
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nie mo�na skopiowa� lub przenie�� list�w do folderu wirtualnego"
 
-#: camel/camel-vee-store.c:1
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie mo�na usun�� folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:1
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie mo�na usun�� folderu: %s: Folder nie istnieje"
 
-#: camel/camel-vee-store.c:1
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:1
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie mo�na zmieni� nazwy folderu %s: Folder nie istnieje"
 
-#: camel/providers/imap/camel-imap-command.c:1
-#: camel/providers/imap/camel-imap-command.c:1
-#: camel/providers/imap/camel-imap-command.c:1
-#: camel/providers/imap/camel-imap-store.c:1
+#: 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 "Operacja anulowana"
 
-#: camel/providers/imap/camel-imap-command.c:1
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serwer nieoczekiwanie przerwa� po��czenie: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:326
 #, fuzzy, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr "Nieoczekiwana odpowied� od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied� od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nie powiod�o si� polecenie IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Odpowied� serwera zako�czy�a si� zbyt wcze�nie."
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:652
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpowied� serwera IMAP nie zawiera informacji %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied� OK od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie mo�na utworzy� katalogu %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nie mo�na wczyta� zestawienia dla %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:306
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder na serwerze zosta� usuni�ty i utworzony ponownie."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Wyszukiwanie zmodyfikowanych list�w"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nie mo�na pobra� listu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
+#: 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
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8851,167 +8926,158 @@ msgstr ""
 "Nie mo�na pobra� listu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
+#: 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 "Nie ma takiego listu"
 
-#: camel/providers/imap/camel-imap-folder.c:1
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "Ten list jest obecnie niedost�pny"
 
-#: camel/providers/imap/camel-imap-folder.c:1
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr "Pobieranie informacji podsumowuj�cych nowe listy"
 
-#: camel/providers/imap/camel-imap-folder.c:1
-msgid "Scanning for new messages"
-msgstr "Wyszukiwanie nowych list�w"
-
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "Nie mo�na odnale�� tre�ci listu w odpowiedzi na FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:1
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nie mo�na otworzy� katalogu cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:1
-#: camel/providers/imap/camel-imap-message-cache.c:1
-#: camel/providers/imap/camel-imap-message-cache.c:1
-#: camel/providers/imap/camel-imap-message-cache.c:1
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nie mo�na zapisa� listu %s w cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:1
+#: camel/providers/imap/camel-imap-message-cache.c:417
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Nie mo�na zapisa� w cache %s: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Sprawdzanie nowej poczty"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Sprawdzanie nowych list�w we wszystkich folderach"
 
-#: camel/providers/imap/camel-imap-provider.c:1 shell/e-shell-view.c:1
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
 msgid "Folders"
 msgstr "Foldery"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Show only subscribed folders"
 msgstr "Wy�wietlanie tylko zasubskrybowanych folder�w"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Override server-supplied folder namespace"
 msgstr "Nadpisanie przestrzeni nazw podanej przez serwer"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:54
 msgid "Namespace"
 msgstr "Przestrze� nazw"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Zastosowywanie filtr�w w odniesieniu do nowych list�w w INBOX na tym serwerze"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Do przegl�dania i przechowywania poczty na serwerach IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/pop3/camel-pop3-provider.c:1 mail/mail-config.glade.h:1
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Has�o"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Przy tej opcji po��czenie z serwerem IMAP nast�pi przy u�yciu has�a w "
 "postaci czystego tekstu."
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr "Serwer IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "us�uga %s dla %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: 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 "Anulowano po��czenie"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie mo�na nawi�za� po��czenia z %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/imap/camel-imap-store.c:1
+#: 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 ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Wyst�pi� b��d przy wysy�aniu nazwy u�ytkownika: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/imap/camel-imap-store.c:647
+#: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "Rozszerzenie SSL/TLS nie jest obs�ugiwane."
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/imap/camel-imap-store.c:678
+#: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr "Negocjacja SSL nie powiod�a si�"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#, c-format
-msgid "The folder %s no longer exists"
-msgstr "Folder o nazwie %s ju� nie istnieje"
-
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:1087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serwer IMAP-a %s nie obs�uguje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: 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 "Brak obs�ugi typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:1121
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPodaj has�o IMAP dla %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono has�a."
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9022,63 +9088,63 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:1814
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Nazwa folderu \"%s\" jest niepoprawna, gdy� zawiera znak \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:1826
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nieznany folder nadrz�dny: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder nadrz�dny nie mo�e zawiera� folder�w podrz�dnych"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:1
+#: camel/providers/local/camel-local-folder.c:352
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:1
-#: camel/providers/local/camel-local-folder.c:1
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Nie mo�na otworzy� skrzynki: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:1
+#: camel/providers/local/camel-local-folder.c:363
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:43
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Katalogi z listami formacie MH"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Do przechowywania lokalnej poczty w katalogach podobnych do MH."
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Dostarczanie lokalne"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:66
 #, fuzzy
 msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
@@ -9086,29 +9152,29 @@ msgid ""
 msgstr ""
 "Do pobierania lokalnej poczty ze standardowych kolejek w formacie mbox."
 
-#: camel/providers/local/camel-local-provider.c:1
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Zastosowywanie filtr�w w odniesieniu do nowych list�w w INBOX"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Katalogi z listami formacie Maildir"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Do przechowywania lokalnej poczty w katalogach Maildir."
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:95
 msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:101
 #, fuzzy
 msgid "Standard Unix mbox spool or directory"
 msgstr "Standardowe uniksowe kolejki mbox"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
@@ -9117,81 +9183,82 @@ msgstr ""
 "Do odczytu i przechowywania lokalnej poczty w standardowych plikach kolejek "
 "w formacie mbox."
 
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-local-store.c:139
+#: 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 ""
 "Lokalizacja nadrz�dna miejsca przechowywania %s nie jest �cie�k� bezwzgl�dn�"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 "Lokalizacja nadrz�dna miejsca przechowywania %s nie jest zwyk�ym katalogiem"
 
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nie mo�na pobra� folderu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne miejsca przechowywania nie maj� skrzynki nadchodz�cej"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalny plik z listami %s"
 
-#: camel/providers/local/camel-local-store.c:1 mail/mail-local.c:1
+#: 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 "Nie mo�na zmieni� nazwy folderu %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:363
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nie mo�na zmieni� nazwy \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nie mo�na usun�� pliku z zestawieniem folderu \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie mo�na usun�� pliku \"%s\" z indeksem folderu: %s"
 
-#: camel/providers/local/camel-local-summary.c:1
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nie mo�na zapisa� zestawienia: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:1
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie mo�na doda� listu do zestawienia: przyczyna nieznana"
 
-#: camel/providers/local/camel-maildir-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Anulowano do��czenie listu do katalogu Maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie mo�na do��czy� listu do folderu w formacie maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Niepoprawna zawarto�� listu"
 
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: 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"
@@ -9200,16 +9267,18 @@ msgstr ""
 "Nie mo�na otworzy� folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mbox-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: 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 "Folder \"%s\" nie istnieje."
 
 # y, c-format
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: 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"
@@ -9218,73 +9287,74 @@ msgstr ""
 "Nie mo�na utworzy� folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:1
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" nie jest katalogiem z listami w formacie maildir."
 
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie mo�na usun�� folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:1
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "to nie katalog z listami w formacie maildir"
 
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-maildir-store.c:335
+#: 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 "Nie mo�na przeszuka� folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-summary.c:1
-#: camel/providers/local/camel-maildir-summary.c:1
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nie mo�na otworzy� katalogu z listami ze scie�ki: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:1
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr "Sprawdzanie sp�jno�ci folderu"
 
-#: camel/providers/local/camel-maildir-summary.c:1
+#: camel/providers/local/camel-maildir-summary.c:640
 msgid "Checking for new messages"
 msgstr "Wyszukiwanie nowych list�w"
 
-#: camel/providers/local/camel-maildir-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-maildir-summary.c:729
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Zapisywanie folderu"
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nie mo�na utworzy� blokady folderu dla %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nie mo�na otworzy� skrzynki: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:274
 msgid "Mail append cancelled"
 msgstr "Anulowano do��czenie listu"
 
-#: camel/providers/local/camel-mbox-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:277
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nie mo�na do��czy� listu do pliku mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:396
+#: camel/providers/local/camel-mbox-folder.c:404
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9293,15 +9363,15 @@ msgstr ""
 "Nie mo�na pobra� listu: %s z folderu %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:397
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Folder jest uszkodzony w spos�b uniemo�liwiaj�cy napraw�."
 
-#: camel/providers/local/camel-mbox-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:405
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Utworzenie listu nie powiod�o si�: Uszkodzona skrzynka?"
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9310,7 +9380,7 @@ msgstr ""
 "Nie mo�na otworzy� pliku \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9319,14 +9389,14 @@ msgstr ""
 "Nie mo�na utworzy� pliku \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:1
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" nie jest zwyk�ym plikiem."
 
-#: camel/providers/local/camel-mbox-store.c:1
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9335,155 +9405,160 @@ msgstr ""
 "Nie mo�na usun�� folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder \"%s\" nie jest pusty. Nie zosta� usuni�ty."
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nie mo�na otworzy� folderu %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Powa�ny b��d sk�adniowy na pozycji %ld w folderze %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nie mo�na sprawdzi� folderu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nie mo�na otworzy� pliku %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie mo�na otworzy� tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie mo�na zamkn�� folderu �r�d�owego %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie mo�na zamkn�� folderu tymczasowego: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Niezgodno�� folderu z zestawieniem, nawet po synchronizacji"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:848
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nieznany b��d: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:883
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nie mo�na zapisa� folderu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:976
+#: camel/providers/local/camel-mbox-summary.c:1001
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "B��d przy zapisie do tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:993
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nie powi�d� si� zapis do tymczasowej skrzynki: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:1
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Anulowano do��czenie listu do katalogu MH"
 
-#: camel/providers/local/camel-mh-folder.c:1
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie mo�na do��czy� listu do folderu mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: camel/providers/local/camel-mh-summary.c:1
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nie mo�na otworzy� �cie�ki katalogu MH: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Nie mo�na otworzy� kolejki \"%s\": %s"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:130
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Kolejka \"%s\" nie jest zwyk�ym plikiem lub katalogiem"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Folder \"%s/%s\" nie istnieje."
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "\"%s\" nie jest zwyk�ym plikiem."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Plik %s z kolejk� list�w"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Nie mo�na zmienia� nazw folder�w kolejek"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Nie mo�na zmienia� nazw folder�w kolejek"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Nie mo�na usuwa� folder�w kolejek"
 
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nie mo�na zsynchronizowa� folderu tymczasowego %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nie mo�na zsynchronizowa� folderu kolejki %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -9492,31 +9567,31 @@ msgstr ""
 "Nie mo�na zsynchronizowa� folderu kolejki %s: %s\n"
 "Folder mo�e by� uszkodzony, zapisano kopi� w \"%s\""
 
-#: camel/providers/nntp/camel-nntp-provider.c:1
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Nowiny USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:1
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "To jest dostawca pozwalaj�cy na odczyt i wysy�anie na grupy nowin USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:151
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nie mo�na utworzy� katalogu %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nowiny USENET za po�rednictwem %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9524,108 +9599,109 @@ msgstr ""
 "Przy tej opcji uwierzytelnianie na serwerze NNTP b�dzie przeprowadzane z "
 "u�yciem has�a w postaci czystego tekstu."
 
-#: camel/providers/nntp/camel-nntp-summary.c:1
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
 msgid "No such folder: %s"
 msgstr "Folder nie istnieje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:1
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Nie mo�na pobra� grupy: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:1
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Nie powiod�o si� polecenie NNTP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:1
-#: camel/providers/nntp/camel-nntp-summary.c:1
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Wyszukiwanie nowych list�w"
 
-#: camel/providers/nntp/camel-nntp-summary.c:1
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Nieznana odpowied� serwera: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:1
+#: camel/providers/nntp/camel-nntp-summary.c:566
 #, fuzzy
 msgid "Use cancel"
 msgstr "Anuluj"
 
-#: camel/providers/nntp/camel-nntp-summary.c:1
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operacja nie powiod�a si�: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Pobieranie zestawienia POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
-#: camel/providers/pop3/camel-pop3-folder.c:1
-#: camel/providers/pop3/camel-pop3-folder.c:1
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:486
+#: camel/providers/pop3/camel-pop3-folder.c:503
 msgid "User cancelled"
 msgstr "Operacja anulowana"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Nie mo�na pobra� zestawienia POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Oczyszczanie z usuni�tych list�w"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, c-format
 msgid "No message with uid %s"
 msgstr "Brak listu o warto�ci uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Pobieranie %d. listu z serwera POP"
 
 # c-format
-#: camel/providers/pop3/camel-pop3-folder.c:1
-#: camel/providers/pop3/camel-pop3-folder.c:1
-#: camel/providers/pop3/camel-pop3-folder.c:1
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:488
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:505
+#, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Nie mo�na pobra� listu %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Nieznana przyczyna"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Miejsce przechowywania list�w"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Pozostawianie list�w na serwerze"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Usuwanie po %s dniach"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1 mail/mail-config.glade.h:1
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:54
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Do ��czenia si� i pobierania poczty z serwer�w POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:71
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -9634,7 +9710,7 @@ msgstr ""
 "u�yciem has�a w postaci czystego tekstu. Wiele serwer�w POP obs�uguje tylko "
 "t� opcj�."
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -9644,26 +9720,26 @@ msgstr ""
 "u�yciu protoko�u APOP. Mo�e on nie funkcjonowa� dla wszystkich u�ytkownik�w, "
 "nawet, je�li serwer teoretycznie obs�uguje protok�."
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:183
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem POP %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP %s w trybie bezpiecznym: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:498
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9672,28 +9748,28 @@ msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP %s: Brak obs�ugi wymaganego "
 "mechanizmu uwierzytelniania."
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Nie powiod�o si� polecenie IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nie mo�na przeprowadzi� uwierzytelnienia na serwerze POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPodaj has�o POP dla %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9702,17 +9778,17 @@ msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP %s.\n"
 "Wyst�pi� b��d przy wysy�aniu has�a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:1
-#: mail/mail-config.glade.h:1
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:1
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -9720,197 +9796,197 @@ msgstr ""
 "Do wysy�ania poczty poprzez przekazania jej dzia�aj�cemu lokalnie programowi "
 "\"sendmail\"."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
 #, fuzzy
 msgid "Could not parse recipient list"
 msgstr "Nie mo�na rozpozna� URL-a \"%s\""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nie mo�na utworzy� potoku do programu sendmail: %s: nie wys�ano poczty"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 "Nie mo�na utworzy� procesu dla programu sendmail: %s: nie wys�ano poczty"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nie mo�na wys�a� listu: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "Program sendmail zosta� przerwany przez sygna� %s: nie wys�ano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nie mo�na wykona� %s: nie wys�ano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 "Program sendmail zosta� zako�czony z kodem stanu %d: nie wys�ano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "Wysy�anie list�w za pomoc� programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:1 mail/mail-config.glade.h:1
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:1
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Do wysy�ania poczty poprzez ��czenie si� ze zdalnym serwerem pocztowym przy "
 "u�yciu SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "B��d sk�adniowy. Nie rozpoznano polecenia."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "B��d sk�adniowy w�r�d parametr�w lub argument�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Niezaimplementowane polecenie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Niezaimplementowany parametr polecenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Stan systemu lub odpowied� z pomoc� systemow�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Komunikat pomocy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Us�uga gotowa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Us�uga zamyka kana� transmisyjny"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Us�uga nie jest dost�pna, zamykanie kana�u transmisyjnego"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Pomy�lnie wykonano ��dan� operacj� na li�cie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "U�ytkownik nie jest lokalny; przes�anie do <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Nie wykonano ��danej operacji na li�cie: skrzynka jest niedost�pna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Nie wykonano ��danej operacji: skrzynka jest niedost�pna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Przerwano ��dan� czynno��: b��d przy przetwarzaniu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "U�ytkownik nie jest lokalny; spr�buj <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Nie wykonano ��danej operacji: brak miejsca w miejscu przechowywania list�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Przerwano ��dan� czynno��: przekroczony wykorzystany rozmiar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Nie wykonano ��danej operacji: niedozwolona nazwa skrzynki"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Rozpocznij wprowadzanie listu; zako�cz poprzez <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transakcja nie powiod�a si�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Potrzebna jest zmiana has�a"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizm uwierzytelniania jest zbyt s�aby"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "��dany miechanizm uwierzytelniaj�cy wymaga szyfrowania"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Chwilowe niepowodzenie przy uwierzytelnianiu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "Welcome response error"
 msgstr "B��dna odpowied� na powitanie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: 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 ""
 "Nie mo�na nawi�za� po��czenia z serwerem SMTP %s w trybie bezpiecznym: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:340
 msgid "server does not appear to support SSL"
 msgstr "Wygl�da na to, �e serwer nie obs�uguje protoko�u SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po STARTTLS: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:369
 msgid "STARTTLS response error"
 msgstr "B��dna odpowied� na STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Serwer SMTP %s nie obs�uguje wymaganego typu uwierzytelniania %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPodaj has�o SMTP dla %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9921,88 +9997,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serwer SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Wysy�anie list�w za pomoc� SMTP poprzez %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie mo�na wys�a� listu: niepoprawny adres nadawcy."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1 mail/mail-ops.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Wysy�anie listu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie mo�na wys�a� listu: nie podano odbiorc�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Nie mo�na wys�a� listu: przynajmniej jeden z odbiorc�w jest niepoprawny"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "Powitanie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr "B��dna odpowied� na HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "Uwierzytelnianie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "B��d przy tworzeniu obiektu uwierzytelniaj�cego SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: 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 "Up�yn�� czas oczekiwania po AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Nie powiod�o si� wykonanie AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po MAIL FROM: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "B��dna odpowied� na MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po RCPT TO: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po DATA: %s: nie wys�ano poczty"
@@ -10010,89 +10086,80 @@ msgstr "Up�yn�� czas oczekiwania po DATA: %s: nie wys�ano poczty"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr "B��dna odpowied� na DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: 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 ""
 "Up�yn�� czas oczekiwania na wys�anie DATA: przerwanie listu: %s: nie wys�ano "
 "poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "B��dna odpowied� na RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "B��dna odpowied� na QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:1
-msgid "1 byte"
-msgstr "1 bajt"
-
-#: composer/e-msg-composer-attachment-bar.c:1
-#, c-format
-msgid "%u bytes"
-msgstr "%u bajt�w"
-
-#: composer/e-msg-composer-attachment-bar.c:1
-#, 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:1
-#, 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:1
-#, 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:1 mail/mail-display.c:1
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "za��cznik"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr "Usuwa wybrane elementy z listy za��cznik�w"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Dodaj za��cznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Za��cza plik do listu"
 
-#: composer/e-msg-composer-attachment.c:1
-#: composer/e-msg-composer-attachment.c:1
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nie mo�na za��czy� pliku %s: %s"
 
-#: composer/e-msg-composer-attachment.c:1
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nie mo�na za��czy� pliku %s: to nie jest zwyk�y plik"
@@ -10101,20 +10168,20 @@ msgstr "Nie mo�na za��czy� pliku %s: to nie jest zwyk�y plik"
 msgid "Attachment properties"
 msgstr "W�a�ciwo�ci za��cznika"
 
-#: composer/e-msg-composer-attachment.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nazwa pliku:"
 
-#: composer/e-msg-composer-attachment.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Typ MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:1
-#: composer/e-msg-composer-select-file.c:1
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerowanie automatycznego wy�wietlenia za��cznika"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzy� ksi��k� adresow�"
 
@@ -10125,45 +10192,45 @@ msgstr "Kliknij tu aby otworzy� ksi��k� adresow�"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Odpowied� do:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Podaj adresy, pod kt�re zostanie przes�ana kopia listu"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: 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."
@@ -10173,26 +10240,26 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "Przejd� do"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Brak opisu"
 
-#: composer/e-msg-composer-select-file.c:1
-#: ui/evolution-message-composer.xml.h:1
+#: composer/e-msg-composer-select-file.c:274
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Za��czenie pliku"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:514
 msgid "Could not create a PGP signature context"
 msgstr "Nie mo�na utworzy� kontekstu podpisu PGP"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10201,34 +10268,34 @@ msgstr ""
 "B��d przy odczycie pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Ostrze�enie!"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Plik istnieje, nadpisa�?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "B��d przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "B��d przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "B��d przy dost�pie do pliku: %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Nie mo�na pobra� listu z edytora"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10237,7 +10304,7 @@ msgstr ""
 "Nie mo�na zmieni� po�o�enia w pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10246,7 +10313,7 @@ msgstr ""
 "Nie mo�na przyci�� pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10255,7 +10322,7 @@ msgstr ""
 "B��d przy automatycznym zapisie listu: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1
+#: 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?"
@@ -10263,7 +10330,7 @@ msgstr ""
 "Odnaleziono niezapisane pliki z poprzedniej sesji Evolution.\n"
 "Czy chcesz spr�bowa� je odzyska�?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1525
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10274,27 +10341,27 @@ msgstr ""
 "\n"
 "Czy chcesz zapisa� zmiany?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Uwaga: Zmodyfikowany list"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1927
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:1 mail/mail-account-gui.c:1
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr "Wygenerowany automatycznie"
 
-#: composer/e-msg-composer.c:1 composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10302,7 +10369,18 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� formantu wyboru adresu."
 
-#: composer/e-msg-composer.c:1 composer/e-msg-composer.c:1
+#: 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 ""
+"Nie mo�na otworzy� okna tworzenia listu:\n"
+"Nie mo�na uaktywni� komponentu edytora HTML-a."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10310,15 +10388,15 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� komponentu edytora HTML-a."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:3858
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be "
-"edited.)<b>"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
 msgstr ""
 "<b>(Edytor list�w zawiera tre�� nie b�d�c� tekstem, kt�ra nie mo�e podlega� "
 "modyfikacjom.)</b>"
 
-#: composer/evolution-composer.c:1
+#: composer/evolution-composer.c:393
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -10326,15 +10404,16 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu, poniewa� w komponencie\n"
 "pocztowym nie zosta�y jeszcze skonfigurowane �adne to�samo�ci."
 
-#: composer/evolution-composer.c:1
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Nie mo�na zainicjowa� edytora list�w Evolution."
 
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution - pakiet do pracy grupowej"
 
-#: data/evolution.desktop.in.h:1
+#: data/evolution.desktop.in.h:2
 msgid "Ximian Evolution"
 msgstr "Ximian Evolution"
 
@@ -10342,7 +10421,7 @@ msgstr "Ximian Evolution"
 msgid "address card"
 msgstr "karta adresowa"
 
-#: data/evolution.keys.in.h:1
+#: data/evolution.keys.in.h:2
 msgid "calendar information"
 msgstr "informacje kalendarza"
 
@@ -10350,36 +10429,36 @@ msgstr "informacje kalendarza"
 msgid "Body contains"
 msgstr "Tre�� zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:2
 msgid "Body does not contain"
 msgstr "Tre�� nie zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:3
 msgid "Body or subject contains"
 msgstr "Tre�� lub temat zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:4
 msgid "Message contains"
 msgstr "List zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:5
 msgid "Recipients contain"
 msgstr "Lista odbiorc�w zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:6
 msgid "Sender contains"
 msgstr "Nadawca zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:7
 msgid "Subject contains"
 msgstr "Temat zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:8
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
-#: e-util/e-dialog-utils.c:1 mail/mail-callbacks.c:1
-#: mail/mail-display.c:1
+#: 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?"
@@ -10387,213 +10466,211 @@ msgstr ""
 "Plik o tej nazwie ju� istnieje.\n"
 "Nadpisa� go?"
 
-#: e-util/e-passwords.c:1
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Zapami�tanie has�a"
 
-#: e-util/e-passwords.c:1
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Zapami�tanie tego has�a na czas bie��cej sesji"
 
-#: e-util/e-pilot-settings.c:1
+#: e-util/e-pilot-settings.c:96
 msgid "Sync Private Records:"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:1
+#: e-util/e-pilot-settings.c:105
 #, fuzzy
 msgid "Sync Categories:"
 msgstr "Kategorie"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:1
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:186
 msgid "seconds"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:71
 msgid "minute"
 msgstr "minuta"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:72
 msgid "hour"
 msgstr "godzina"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "tydzie�"
 
-#: filter/filter-datespec.c:1 filter/filter.glade.h:1
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "tygodni"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:75
 msgid "month"
 msgstr "miesi�c"
 
-#: filter/filter-datespec.c:1 filter/filter.glade.h:1
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
 msgid "months"
 msgstr "miesi�cy"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:76
 msgid "year"
 msgstr "rok"
 
-#: filter/filter-datespec.c:1 filter/filter.glade.h:1
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
 msgid "years"
 msgstr "lat"
 
-#: filter/filter-datespec.c:1
-msgid "You have forgotten to choose a date."
+#: filter/filter-datespec.c:174
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Nie zesta�a wybrana data."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:269
 msgid "<click here to select a date>"
 msgstr "<kliknij, aby wybra� dat�>"
 
-#: filter/filter-datespec.c:1 filter/filter-datespec.c:1
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "teraz"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:279
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
 #. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:1 filter/filter-datespec.c:1
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
 #, c-format
 msgid "%d %s ago"
 msgstr "%d %s temu"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:407
 msgid "Select a time to compare against"
 msgstr "Wyb�r czasu odniesienia"
 
-#: filter/filter-editor.c:1 filter/filter.glade.h:1
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Regu�y filtr�w"
 
-#: filter/filter-file.c:1
+#: filter/filter-file.c:178
 msgid "You must specify a file name"
 msgstr ""
 
-#: filter/filter-file.c:1
+#: filter/filter-file.c:190
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Plik \"%s\" nie istnieje lub nie jest zwyk�ym plikiem."
 
-#: filter/filter-file.c:1
+#: filter/filter-file.c:307
 msgid "Choose a file"
 msgstr "Wyb�r pliku"
 
 #. and now for the action area
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Podejmowane czynno�ci"
 
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Dodaj czynno��"
 
-#: filter/filter-folder.c:1
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Nie zosta� wybrany folder.\n"
-"Wr�� i podaj folder, do kt�rego powinna by� dostarczona poczta."
+#: filter/filter-folder.c:149
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Nale�y nada� temu vFolderowi nazw�."
 
-#: filter/filter-folder.c:1 filter/vfolder-rule.c:1
-#: mail/mail-account-gui.c:1 mail/mail-account-gui.c:1
+#: 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 "Wyb�r folderu"
 
-#: filter/filter-input.c:1
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10602,74 +10679,74 @@ msgstr ""
 "B��d w wyra�eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:1 filter/libfilter-i18n.h:1 mail/mail-config.c:1
-#: mail/mail-config.glade.h:1
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
+#: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "Wa�ny"
 
 #. red
-#: filter/filter-label.c:1 mail/mail-config.c:1
-#: mail/mail-config.glade.h:1
+#: filter/filter-label.c:137 mail/mail-config.c:77
+#: mail/mail-config.glade.h:136
 msgid "Work"
 msgstr "Praca"
 
 #. orange
-#: filter/filter-label.c:1 mail/mail-config.c:1 mail/mail-config.glade.h:1
+#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr "Osobiste"
 
 #. forest green
-#: filter/filter-label.c:1 mail/mail-config.c:1
-#: mail/mail-config.glade.h:1
+#: filter/filter-label.c:139 mail/mail-config.c:79
+#: mail/mail-config.glade.h:127
 msgid "To Do"
 msgstr "Do zrobienia"
 
 #. blue
-#: filter/filter-label.c:1 mail/mail-config.c:1 mail/mail-config.glade.h:1
+#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
 msgid "Later"
 msgstr "P�niej"
 
-#: filter/filter-part.c:1 shell/evolution-test-component.c:1
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Nale�y nada� temu filtrowi nazw�."
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Nazwa regu�y: "
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Bez nazwy"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Lista warunk�w"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Wykonywanie czynno�ci"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "przy spe�nieniu wszystkich kryteri�w"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr "przy spe�nieniu kt�regokolwiek z kryteri�w"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Dodaj kryterium"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "nadchodz�ce"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "wychodz�ce"
 
@@ -10677,23 +10754,23 @@ msgstr "wychodz�ce"
 msgid "Compare against"
 msgstr "Por�wnanie z"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Modyfikacja filtr�w"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Modyfikacja VFolder�w"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Nadchodz�ce"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Wychodz�ce"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:7
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -10702,7 +10779,7 @@ msgstr ""
 "Data listu b�dzie por�wnywana z czasem podanym\n"
 "poni�ej."
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:9
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -10712,7 +10789,7 @@ msgstr ""
 "jako wzgl�dny do czasu zastosowania filtra, np.\n"
 "\"tydzie� temu\"."
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:11
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -10721,353 +10798,353 @@ msgstr ""
 "Data listu b�dzie por�wnywana z czasem podanym\n"
 "poni�ej."
 
-#: filter/filter.glade.h:1 filter/vfolder-editor.c:1
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Wirtualne foldery"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:18
 msgid "a time relative to the current time"
 msgstr "czasem podanym wzgl�dem bie��cego"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:19
 msgid "ago"
 msgstr "temu"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "tylko okre�lone foldery"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:26
 msgid "the current time"
 msgstr "bie��cym czasem"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:27
 #, fuzzy
 msgid "the time you specify"
 msgstr "podanym czasem"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "�r�d�a VFolder�w"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "ze wszystkimi aktywnymi zdalnymi folderami"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "ze wszystkimi lokalnymi i aktywnymi zdalnymi folderami"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "ze wszystkimi lokalnymi folderami"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Dopasuj punkty"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Przypisz kolor"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Przypisz punkty"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Za��czniki"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Beep"
 msgstr "Bremen"
 
-#: filter/libfilter-i18n.h:1
-msgid "contains"
-msgstr "zawiera"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Skopiuj do folderu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data otrzymania"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data wys�ania"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Usuni�ty"
 
-#: filter/libfilter-i18n.h:1
-msgid "does not contain"
-msgstr "nie zawiera"
-
-#: filter/libfilter-i18n.h:1
-msgid "does not end with"
-msgstr "nie ko�czy si� na"
-
-#: filter/libfilter-i18n.h:1
-msgid "does not exist"
-msgstr "nie istnieje"
-
-#: filter/libfilter-i18n.h:1
-#, fuzzy
-msgid "does not return"
-msgstr "nie istnieje"
-
-#: filter/libfilter-i18n.h:1
-msgid "does not sound like"
-msgstr "nie brzmi jak"
-
-#: filter/libfilter-i18n.h:1
-msgid "does not start with"
-msgstr "nie rozpoczyna si� od"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Nie istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Roboczy"
 
-#: filter/libfilter-i18n.h:1
-msgid "ends with"
-msgstr "ko�czy si� na"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Istnieje"
 
-#: filter/libfilter-i18n.h:1
-msgid "exists"
-msgstr "istnieje"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Wyra�enie"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1
-msgid "is"
-msgstr "jest"
-
-#: filter/libfilter-i18n.h:1
-msgid "is after"
-msgstr "jest po"
-
-#: filter/libfilter-i18n.h:1
-msgid "is before"
-msgstr "jest przed"
-
-#: filter/libfilter-i18n.h:1
-#, fuzzy
-msgid "is Flagged"
-msgstr "Oznaczony"
-
-#: filter/libfilter-i18n.h:1
-msgid "is greater than"
-msgstr "jest wi�kszy ni�"
-
-#: filter/libfilter-i18n.h:1
-msgid "is less than"
-msgstr "jest mniejszy ni�"
-
-#: filter/libfilter-i18n.h:1
-msgid "is not"
-msgstr "nie jest"
-
-#: filter/libfilter-i18n.h:1
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Oznaczony"
-
-#: filter/libfilter-i18n.h:1 mail/folder-browser.c:1
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Lista dyskusyjna"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Tre�� listu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Nag��wek listu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Przenie� do folderu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Wy�lij list do kontaktu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Odtwarzany d�wi�k:"
 
-#: filter/libfilter-i18n.h:1 mail/message-tag-followup.c:1
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Przeczytany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Lista odbiorc�w"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Dopasowanie wg regexp"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Z odpowiedzi� do"
 
-#: filter/libfilter-i18n.h:1
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:1
-#, fuzzy
-msgid "returns greater than"
-msgstr "jest wi�kszy ni�"
-
-#: filter/libfilter-i18n.h:1
-#, fuzzy
-msgid "returns less than"
-msgstr "jest mniejszy ni�"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:29
 msgid "Run Once"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1 filter/score-rule.c:1 filter/score-rule.c:1
-#: mail/message-list.etspec.h:1
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punkty"
 
-#: filter/libfilter-i18n.h:1 mail/mail-callbacks.c:1
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Nadawca"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Ustaw stan"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:33
 msgid "Shell Command"
 msgstr "Polecenie pow�oki"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Rozmiar (KB)"
 
-#: filter/libfilter-i18n.h:1
-msgid "sounds like"
-msgstr "brzmi jak"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Konto �r�d�owe"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Okre�lony nag��wek"
 
-#: filter/libfilter-i18n.h:1
-msgid "starts with"
-msgstr "rozpoczyna si� od"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:1 mail/mail-format.c:1
-#: mail/message-list.etspec.h:1
+#: 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 "Temat"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Ustaw stan"
 
-#: filter/rule-editor.c:1
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "zawiera"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "nie zawiera"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "nie ko�czy si� na"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "nie istnieje"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "nie istnieje"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "nie brzmi jak"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "nie rozpoczyna si� od"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "ko�czy si� na"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "istnieje"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "Oznaczony"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "jest po"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "jest przed"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "jest wi�kszy ni�"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "jest mniejszy ni�"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Oznaczony"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "nie jest"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "jest"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "jest wi�kszy ni�"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "jest mniejszy ni�"
+
+#: filter/libfilter-i18n.h:60
+msgid "returns"
+msgstr ""
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "brzmi jak"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "rozpoczyna si� od"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regu�y"
 
-#: filter/rule-editor.c:1 filter/rule-editor.c:1
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
 #, c-format
 msgid "Rule name '%s' is not unique, choose another"
 msgstr ""
 
-#: filter/rule-editor.c:1
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Dodaj regu��"
 
-#: filter/rule-editor.c:1
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Zmodyfikuj regu��"
 
-#: filter/score-editor.c:1
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "Regu�y punktacji"
 
-#: filter/vfolder-rule.c:1
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Nale�y nada� temu vFolderowi nazw�."
 
-#: filter/vfolder-rule.c:1
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Nale�y poda� jako �r�d�o przynajmniej jeden folder."
 
-#: importers/elm-importer.c:1
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje star� poczt� Elma"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importowanie..."
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Poczekaj chwil�"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
+#: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importowanie %s jako %s"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
+#: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizowanie %s"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1 mail/component-factory.c:1
-#: mail/folder-browser-ui.c:1
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "Poczta"
 
-#: importers/elm-importer.c:1
+#: importers/elm-importer.c:545
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11075,11 +11152,11 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Elm.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/elm-importer.c:1
+#: importers/elm-importer.c:574
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:1
+#: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11087,12 +11164,12 @@ msgstr ""
 "Odnaleziono pliki programu GnomeCard.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:70
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Priorytet: %s"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:653
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11107,7 +11184,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:677
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11115,7 +11192,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:694
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11124,38 +11201,38 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje stare dane Netscape'a"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1 mail/mail-ops.c:1
-#: shell/e-local-storage.c:1
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "�mietnik"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokalny plik z listami %s"
 
-#: importers/netscape-importer.c:1 importers/pine-importer.c:1
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Analizowanie katalogu"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Rozpoczynanie importowania"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:2138
 msgid "Mail Filters"
 msgstr "Filtry list�w"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11163,11 +11240,11 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Netscape.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/pine-importer.c:1
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importuje stare dane Pine'a"
 
-#: importers/pine-importer.c:1
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11175,7 +11252,7 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Pine.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/pine-importer.c:1
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -11183,115 +11260,125 @@ msgstr "Pine"
 msgid "Composer Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
 msgid "Configuration control for the Evolution Display Fonts."
 msgstr "Generator edytora list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
 #, fuzzy
 msgid "Configuration control for the Evolution Mail Accounts."
 msgstr "Generator formantu zada� Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
 #, fuzzy
 msgid "Configuration control for the Evolution Mailer."
 msgstr "Generator edytora list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 #, fuzzy
 msgid "Configuration control for the Evolution Message Composer."
 msgstr "Generator edytora list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 #, fuzzy
 msgid "Configure the fonts used by Evolution here"
 msgstr "Generator edytora list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 #, fuzzy
 msgid "Configure your email accounts here"
 msgstr ""
 "Pozwala na utworzenie i modyfikacj� kont pocztowych oraz innych ustawie�"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution component for handling mail."
 msgstr "Komponent Evolution obs�uguj�cy poczt�."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Evolution mail composer."
 msgstr "Edytor list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Evolution mail executive summary component."
 msgstr "Komponent zestawienia wykonawczego poczty Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
 msgid "Evolution mail folder display component."
 msgstr "Komponent wy�wietlania folderu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 msgid "Evolution mail folder factory component."
 msgstr "Generator komponent�w folderu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15
 msgid "Factory for the Evolution composer."
 msgstr "Generator edytora list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Factory for the Mail Summary component."
 msgstr "Generator komponentu zestawienia poczty."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
 msgid "Font Preferences"
 msgstr "Ustawienia czcionek"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
 msgid "Mail Accounts"
 msgstr "Konta pocztowe"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1 mail/mail-config.glade.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
 msgid "Mail Preferences"
 msgstr "Ustawienia poczty"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
 msgid "Mail configuration interface"
 msgstr "Interfejs konfiguracji poczty"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Folder zawieraj�cy poczt�"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Publiczny"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Folder zawieraj�cy poczt�"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Wirtualny �mietnik"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Folder wirtualnego �mietnika"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Ten folder nie mo�e zawiera� list�w."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "W�a�ciwo�ci..."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Zmienia w�a�ciwo�ci folderu"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11299,263 +11386,264 @@ msgstr ""
 "Wygl�da na to, �e cz�� twoich ustawie� poczty zosta�a uszkodzona. Upewnij "
 "si�, �e wszystko jest na miejscu."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Nie zosta� ustawiony spos�b przekazywania list�w"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Uwaga: Zmodyfikowany list"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "L_ist"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Tworzenie listu"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Poprzedni list"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:1
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "Nie mo�na zainicjowa� komponentu pocztowego Evolution."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nie mo�na zainicjowa� komponentu konfiguracji poczty Evolution."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nie mo�na zainicjowa� komponentu informacji o folderach Evolution."
 
-#: mail/component-factory.c:1 mail/component-factory.c:1
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 msgid "Connecting..."
 msgstr "Nawi�zywanie po��czenia..."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Nie mo�na zarejstrowa� w pow�oce miejsca przechowywania"
 
-#: mail/folder-browser-ui.c:1
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "W�a�ciwo�ci \"%s\""
 
-#: mail/folder-browser-ui.c:1
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "W�a�ciwo�ci"
 
-#: mail/folder-browser.c:1 mail/mail-display.c:1 mail/mail-display.c:1
+#: 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 "Nie mo�na utworzy� katalogu tymczasowego: %s"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:764
 #, c-format
 msgid "%d new"
 msgstr "nowych: %d"
 
-#: mail/folder-browser.c:1 mail/folder-browser.c:1
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:767 mail/folder-browser.c:775
+#: mail/folder-browser.c:778
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d hidden"
 msgstr "ukrytych: %d"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:771
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:776
 #, c-format
 msgid "%d selected"
 msgstr "zaznaczonych: %d"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d unsent"
 msgstr "niewys�anych: %d"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:783
 #, c-format
 msgid "%d sent"
 msgstr "niewys�anych: %d"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:785
 #, c-format
 msgid "%d total"
 msgstr "og�em: %d"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1113
 msgid "Create _Virtual Folder From Search..."
 msgstr "Utw�rz _wirtualny folder na podstawie wyszukiwania..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawc�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorc�w"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _list� dyskusyjn�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawc�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorc�w"
 
-#: mail/folder-browser.c:1 mail/folder-browser.c:1
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_st� dyskusyjn�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Odpowiedz na _list�"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Prze�lij"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Zako�czone"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Wyczy��"
 
 #. separator here?
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako wa�ny"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Ozn_acz jako niewa�ne"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Cofnij usuni�cie"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: mail/folder-browser.c:1 ui/evolution-addressbook.xml.h:1
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawc� do ksi��ki adresowej"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Utw�rz regu�� na podstawie listu"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VFolder w oparciu o list� dyskusyjn�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.h:1 mail/mail-config.glade.h:1
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 msgid "Default"
 msgstr "Domy�lny"
 
-#: mail/folder-info.c:1
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Pobieranie informacji o folderze"
 
@@ -11563,7 +11651,7 @@ msgstr "Pobieranie informacji o folderze"
 msgid "Factory to import mbox into Evolution"
 msgstr "Generator importu plik�w mbox do Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
 msgid "Imports mbox files into Evolution"
 msgstr "Importuje pliki mbox do Evolution."
 
@@ -11571,7 +11659,7 @@ msgstr "Importuje pliki mbox do Evolution."
 msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr "Generator importu plik�w Outlook Express 4 do Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importuje pliki Outlook Express 4 do Evolution."
 
@@ -11579,16 +11667,16 @@ msgstr "Importuje pliki Outlook Express 4 do Evolution."
 msgid "Current store format:"
 msgstr "Bie��cy format przechowywania:"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:2
 #, fuzzy
 msgid "Index body contents"
 msgstr "Tre�� zawiera"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nowy format przechowywania:"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -11599,109 +11687,109 @@ msgstr ""
 "do stanu, w kt�rym automatyczne odtworzenie danych nie b�dzie\n"
 "mo�liwe. Korzystaj wi�c z tej opcji bardzo ostro�nie."
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:1
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Nie zosta�y podane wszystkie wymagane informacje."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:1
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:1 mail/mail-config.glade.h:1
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_Komputer:"
 
-#: mail/mail-account-gui.c:1 mail/mail-config.glade.h:1
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 msgid "User_name:"
 msgstr "Nazwa _u�ytkownika:"
 
-#: mail/mail-account-gui.c:1 mail/mail-config.glade.h:1
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "�_cie�ka:"
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Nie mo�na utworzy� dw�ch kont o tej samej nazwie."
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Czy na pewno chcesz usun�� to konto?"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Nie usuwaj"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Rzeczywi�cie usun�� konto?"
 
-#: mail/mail-accounts.c:1 mail/mail-accounts.c:1
-#: mail/mail-composer-prefs.c:1 mail/mail-composer-prefs.c:1
-#: mail/mail-composer-prefs.c:1
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "Unieaktywnij"
 
-#: mail/mail-accounts.c:1 mail/mail-accounts.c:1
-#: mail/mail-composer-prefs.c:1 mail/mail-composer-prefs.c:1
-#: mail/mail-composer-prefs.c:1
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "Uaktywnij"
 
-#: mail/mail-accounts.c:1 mail/mail-accounts.etspec.h:1
-#: mail/mail-config.glade.h:1
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:54
 msgid "Enabled"
 msgstr "Aktywne"
 
-#: mail/mail-accounts.c:1 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Nazwa konta"
 
-#: mail/mail-accounts.c:1 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protok�"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "List do %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Tematem jest %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "List od %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "lista dyskusyjna %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Dodanie regu�y filtra"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11713,7 +11801,7 @@ msgstr ""
 "   \"%s\"\n"
 "I zosta�y zaktualizowane."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:154
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11726,7 +11814,7 @@ msgstr ""
 "jakichkolwiek list�w.\n"
 "Czy chcesz przeprowadzi� j� teraz?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:203
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11734,7 +11822,7 @@ msgstr ""
 "Przed wys�aniem listu nale�y skonfigurowa�\n"
 "wykorzystywan� to�samo��."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:217
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11743,19 +11831,20 @@ msgstr ""
 "spos�b przekazywania list�w."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:1
+#: 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 ""
 "Zamierzasz wys�a� list zapisany w HTML-u, lecz wymienieni poni�ej odbiorcy "
 "�e nie chc� otrzymywa� list�w w tej postaci:\n"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:270
 msgid "Send anyway?"
 msgstr "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:312
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11763,7 +11852,7 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "Rzeczywi�cie wys�a�?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:356
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11772,11 +11861,11 @@ msgstr ""
 "ukrywa� adresy jej cz�onk�w, list zawiera� b�dzie tylko ukrytych adresat�w "
 "(bcc)."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:360
 msgid "This message contains only Bcc recipients."
 msgstr "Ten list zawiera tylko ukrytych adresat�w (bcc)"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:364
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11786,11 +11875,11 @@ msgstr ""
 "nag��wek Apparently-To.\n"
 "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:513
 msgid "You must specify recipients in order to send this message."
 msgstr "Przed wys�aniem listu nale�y poda� jego odbiorc�w."
 
-#: mail/mail-callbacks.c:1
+#: 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?"
@@ -11798,28 +11887,28 @@ msgstr ""
 "Nie mo�na otworzy� folderu poczty roboczej, zwi�zanego z tym kontem.\n"
 "Czy chcesz zamiast tego wykorzysta� domy�lny folder Poczta robocza?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "nieznany nadawca"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "W li�cie z %a, %d-%m-%Y, godz. %H:%M, %%s pisze: "
 
-#: mail/mail-callbacks.c:1 mail/message-browser.c:1
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Przeniesienie list�w do folderu"
 
-#: mail/mail-callbacks.c:1 mail/message-browser.c:1
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopiowanie list�w do folderu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Czy na pewno chcesz zredagowa� wszystkie %d list�w?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11827,7 +11916,7 @@ msgstr ""
 "Mo�liwe jest redagowanie wy��cznie\n"
 "list�w zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11835,39 +11924,39 @@ msgstr ""
 "Listy zapisane w folderze Wys�ane\n"
 "mo�na tylko wys�a� ponownie."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Czy na pewno chcesz ponownie wys�a� wszystkie %d list�w?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Nie zaznaczono �adnego listu"
 
-#: mail/mail-callbacks.c:1 mail/mail-display.c:1
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Nadpisa� plik?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Zapis listu pod podan� nazw�"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Zapis list�w pod podan� nazw�"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Wy�wietla kolejny nieprzeczytany list"
 
-#: mail/mail-callbacks.c:1
+#: 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:1
+#: 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"
@@ -11880,7 +11969,7 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11889,67 +11978,67 @@ msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strona %d z %d"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Wydruk listu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "Listowy-US"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiod�o si�"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:3386
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Czy na pewno chcesz otworzy� wszystkie %d list�w w osobnych oknach?"
 
-#: mail/mail-composer-prefs.c:1
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:1 mail/mail-composer-prefs.c:1
-#: mail/mail-composer-prefs.c:1
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 msgid " [script]"
 msgstr " [skrypt]"
 
-#: mail/mail-composer-prefs.c:1
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:1 mail/mail-config.c:1
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 msgid "Unnamed"
 msgstr "Bez nazwy"
 
-#: mail/mail-composer-prefs.c:1
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Wy�lij"
 
-#: mail/mail-composer-prefs.c:1
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Dodaj kryterium"
 
-#: mail/mail-composer-prefs.c:1
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Plik z p_odpisem:"
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:146
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11961,7 +12050,7 @@ msgstr ""
 "chyba, �e chcesz, aby znajduj�ce si� w nich informacje by�y zawarte w "
 "wysy�anych listach."
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:148
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -11971,11 +12060,11 @@ msgstr ""
 "pewno�ci co do tych informacji,\n"
 "zapytaj administratora lub dostawc� Internetu (ISP)."
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:150
 msgid "Please select among the following options"
 msgstr "Wybierz spo�r�d poni�szych opcji"
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:152
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -11985,7 +12074,7 @@ msgstr ""
 "pewno�ci co do tych informacji,\n"
 "zapytaj administratora lub dostawc� Internetu (ISP)."
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:154
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12003,20 +12092,20 @@ msgstr ""
 "kont."
 
 #. set window title
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:633
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
-#: mail/mail-config.c:1
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr "Konto %d"
 
-#: mail/mail-config.c:1
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Sprawdzanie us�ugi"
 
-#: mail/mail-config.c:1 mail/mail-config.c:1
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "Nawi�zywanie po��czenia z serwerem..."
 
@@ -12024,128 +12113,128 @@ msgstr "Nawi�zywanie po��czenia z serwerem..."
 msgid " "
 msgstr " "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr " _Sprawd� obs�ugiwane typy "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Przy wysy�aniu zaszyfrowanych list�w _szyfrowanie zawsze do siebie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:6
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:7
 msgid "Account Editor"
 msgstr "Edytor kont"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
-#: mail/mail-config.glade.h:1 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Zarz�dzanie kontami"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Wy_drukuj..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Zapisz podpis"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Przy wysy�aniu zaszyfrowanych list�w _szyfrowanie zawsze do siebie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "_Podpisywanie wszystkich list�w wychodz�cych przy u�yciu tego konta"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:18
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Za��cza plik do listu"
 
-#: mail/mail-config.glade.h:1 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Za��cznik"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Nieznany zestaw znak�w: %s"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "K_olory"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Sprawdzanie nowej poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Kolor dzisiejszych zada�"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Tworzenie list�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12160,328 +12249,328 @@ msgstr ""
 "\n"
 "Kliknij \"Zako�cz\", aby zapisa� ustawienia."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "D_omy�lne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Domy�lne zachowanie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr "Domy�lne _kodowanie znak�w:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:42
 msgid "Deleting Mail"
 msgstr "Usuwanie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Identyfikatory cyfrowe..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:46
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:1 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Folder ze _szkicami:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:49
 msgid "E_nable"
 msgstr "U_aktywnij"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:50
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Konta pocztowe"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Adres _e-mail:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Opr�nianie folder�w �mietnika przy zako�czeniu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Wykonywanie czynno�ci"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "ko�czy si� na"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:57
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Przes�ane listy"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:59
 msgid "Get Digital ID..."
 msgstr "Pobierz identyfikator cyfrowy..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Oznaczanie cytat�w za pomoc� koloru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:61
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:1 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "To�samo��"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:64
 msgid "Inline"
 msgstr "Tre�� listu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:65
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:66
 msgid "Labels and Colors"
 msgstr "Etykiety i kolory"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:68
 msgid "Loading Images"
 msgstr "Pobieranie obraz�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Po�o�enie skrzynki"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Composer"
 msgstr "Listy"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:73
 msgid "Message Display"
 msgstr "Wy�wietlanie listu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:74
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Powiadamianie o nowej poczcie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "_Organizacja:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _klucza PGP/GPG:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Wyb�r koloru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Potwierdzanie przy wysy�aniu listu tylko z _ukrytymi adresatami (bcc)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Drukowane czcionki"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Katalog maildir Qmaila"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Zapami�tanie has�a"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Odpowied� do:"
 
-#: mail/mail-config.glade.h:1 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opcje odbioru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Zapami�tanie has�a"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Domy�lny"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "B_ezpiecze�stwo"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpieczne MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Wyb�r pliku programu PGP"
 
-#: mail/mail-config.glade.h:1 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Folder z _wys�anymi listami:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Listy wys�ane i szkice"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Skr�ty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:117
 msgid "Signature #1"
 msgstr "Podpis #1"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:118
 msgid "Signature #2"
 msgstr "Podpis #2"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nazwa stylu:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:120
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:121
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:122
 msgid "Standard Unix mbox"
 msgstr "Standardowy uniksowy plik mbox"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:123
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:126
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Zmienny"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:132
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12491,406 +12580,403 @@ msgstr ""
 "\n"
 "Aby rozpocz��, kliknij \"Naprz�d\"."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:137
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Plik z p_odpisem:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "Pobieranie obraz�w z sieci w _ka�dym przypadku"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr "P_odpisywanie wszystkich list�w wychodz�cych przy u�yciu tego konta"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:146
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:147
 msgid "_Certificate ID:"
 msgstr "ID _certyfikatu:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potwierdzanie oczyszczenia folderu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Czy�ci wszystko za wyj�tkiem podpisu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Defaults"
 msgstr "Domy�lny"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:152
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Enable"
 msgstr "Uaktywnij"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:155
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Prze�lij jako"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "_Pe�na nazwa:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Listy napisane w HTML-u"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:161
 msgid "_Identity"
 msgstr "_To�samo��"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:162
 msgid "_Load images if sender is in addressbook"
 msgstr "_Pobieranie obraz�w, je�li nadawca jest w ksi��ce adresowej"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Ustawienie jako konto _domy�lne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "O_znaczanie list�w jako \"przeczytanych\" po up�ywie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:165
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:166
 msgid "_Never load images off the net"
 msgstr "_Bez pobierania jakichkolwiek obraz�w z sieci"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:167
 msgid "_PGP binary path:"
 msgstr "�cie�ka programu _PGP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:169
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Potwierdzanie przy wysy�aniu list�w w formacie HTML do os�b, kt�re ich nie "
 "chc�"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Potwierdzanie przy wysy�aniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Wszystkim"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:174
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Script:"
 msgstr "_Bezpiecze�stwo"
 
-#: mail/mail-config.glade.h:1 ui/evolution-message-composer.xml.h:1
+#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Bezpiecze�stwo"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Forma wy�wietlania czasu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Signatures"
 msgstr "Plik z p_odpisem:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Wykorzystanie bezpiecznego po��czenia (_SSL)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Zmienny"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:182
 msgid "_every"
 msgstr "_co"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:183
 #, fuzzy
 msgid "color"
 msgstr " "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:184
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:187
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Nie mo�na utworzy� kontekstu podpisu S/MIME."
 
 # FIXME
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nie mo�na utworzy� kontekstu certyfikacji S/MIME."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nie mo�na utworzy� kontekstu szyfrowania S/MIME."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nie mo�na utworzy� kontekstu otoczki S/MIME."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Nie mo�na utworzy� kontekstu dekodowania S/MIME."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Zapis za��cznika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nie mo�na utworzy� katalogu tymczasowego: %s"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Zapis za��cznika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Wy�wietl na miejscu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Otw�rz za pomoc� programu %s..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Wy�wietl na miejscu (za pomoc� programu %s)"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Zewn�trzna przegl�darka"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1319
 msgid "Downloading images"
 msgstr "Pobieranie obraz�w"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Wczytywanie tre�ci listu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Z_aleg�e zadania:"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %k:%M"
 
-#: mail/mail-display.c:1
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:1
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "Otw�rz odno�nik w przegl�darce"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Skopiuj adres odno�nika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Zapisz odno�nik jako (FIXME)"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Zapisz obraz jako..."
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:743
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Analizowanie %s"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "Za��cznik: %s"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Nie mo�na przetworzy� jako list MIME. Wy�wietlanie w postaci �r�d�owej."
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Niepoprawny adres"
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Odpowied� do"
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Dla"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Dostarczyciel poczty: "
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "List zosta� podpisany cyfrowo. Kliknij ikon� k��dki, aby uzyska� wi�cej "
 "informacji."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nie mo�na utworzy� kontekstu weryfikacji PGP."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "List zosta� podpisany cyfrowo i potwierdzono jego autentyczno��."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1878
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "List zosta� podpisany cyfrowo lecz nie potwierdzono jego autentyczno�ci."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska�nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Wska�nik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska�nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Wska�nik na zdalne dane (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wska�nik na nieznane zewn�trzne dane (typu \"%s\")"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Niepoprawna forma cz�ci external-body."
 
-#: mail/mail-local.c:1 mail/mail-local.c:1
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokalne foldery/%s"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Przekonfigurowywanie folderu"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -12899,22 +12985,22 @@ msgstr ""
 "Nie mo�na zapisa� metainformacji zwi�zanych z folderem; prawdopodobnie\n"
 "otwarcie folderu nie b�dzie ju� mo�liwe: %s: %s"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nie mo�na zapisa� metadanych zwi�zanych z folderem w %s: %s"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nie mo�na usun�� metadanych zwi�zanych z folderem: %s: %s"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie folderu \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12922,16 +13008,16 @@ msgstr ""
 "Je�li otwarcie tej skrzynki nie b�dzie ju� mo�liwe,\n"
 "w�wczas mo�e by� konieczne r�czne jej naprawienie."
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Zmiana konfiguracji /%s"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1510
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nie mo�na zmieni� formatu zdalnego folderu."
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12940,7 +13026,7 @@ msgstr ""
 "B��d podczas operacji \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12949,108 +13035,108 @@ msgstr ""
 "B��d przy wykonywaniu operacji:\n"
 "%s"
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Przetwarzanie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrowanie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Pobieranie poczty"
 
-#: mail/mail-ops.c:1 mail/mail-ops.c:1
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Mimo wszystko, list zosta� wys�any pomy�lnie."
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Wysy�anie \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Wysy�anie %d. listu z %d"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Niepowodzenie przy %d. li�cie z %d"
 
-#: mail/mail-ops.c:1 mail/mail-send-recv.c:1
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Gotowe."
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie list�w do %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie list�w do %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1051
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie folder�w w \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1234
 msgid "Forwarded messages"
 msgstr "Przes�ane listy"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1277
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1349
 #, c-format
 msgid "Opening store %s"
 msgstr "Otwieranie miejsca przechowywania %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1422
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1516
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Zapisywanie folderu \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1567
 msgid "Refreshing folder"
 msgstr "Od�wie�anie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1603
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1652
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1724
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Pobieranie %d list�w"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1810
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie %d list�w"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13059,7 +13145,7 @@ msgstr ""
 "Nie mo�na utworzy� pliku wyj�ciowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1950
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13068,11 +13154,11 @@ msgstr ""
 "B��d przy zapisie list�w do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2024
 msgid "Saving attachment"
 msgstr "Zapisywanie za��cznika"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2041
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13081,124 +13167,124 @@ msgstr ""
 "Nie mo�na utworzy� pliku wyj�ciowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2071
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo�na zapisa� danych: %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2219
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Od��czanie od %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2219
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawi�zywanie po��czenia z %s"
 
-#: mail/mail-search-dialogue.c:1 widgets/misc/e-search-bar.c:1
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
 msgid "_Search"
 msgstr "_Znajd�"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(List bez nazwy)"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "List bez nazwy"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Pusty list"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Wyszukiwanie w li�cie"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Z rozr�nianiem ma�ych i wielkich liter"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Wyszukiwanie w prz�d"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Znajd�:"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Dopasowania:"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Anulowanie..."
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serwer: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "�cie�ka: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Wysy�anie i odbi�r poczty"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Anuluj wszystko"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: mail/mail-send-recv.c:1 mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:221
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez u�ytkownika."
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Zapami�tanie has�a"
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Zapami�tanie tego has�a na czas bie��cej sesji"
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Wprowad� has�o dla %s"
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Wprowad� has�o"
 
-#: mail/mail-signature-editor.c:1
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nie mo�na zapisa� pliku z podpisem."
 
-#: mail/mail-signature-editor.c:1
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Zapisz podpis"
 
-#: mail/mail-signature-editor.c:1
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13208,38 +13294,38 @@ msgstr ""
 "\n"
 "Czy chcesz je zapisa�?"
 
-#: mail/mail-signature-editor.c:1
-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:1 my-evolution/e-summary-preferences.c:1
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:262
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Przes�any list - %s"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:266
 msgid "Forwarded message"
 msgstr "Przes�any list"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:408
 msgid "Forwarded Message"
 msgstr "Przes�any list"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ustawianie vfolderu: %s"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizowanie vfolder�w pod uri: %s"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13252,209 +13338,235 @@ msgstr ""
 "   \"%s\"\n"
 "I zosta�y zaktualizowane."
 
-#: mail/mail-vfolder.c:1 my-evolution/e-summary-mail.c:1
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vFoldery"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFoldera"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pr�ba zmodyfikowania vfoldera \"%s\", kt�ry nie istnieje"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-browser.c:1
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Brak tematu)"
 
-#: mail/message-browser.c:1
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - List"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Z odpowiedzi�"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Wiele niewidzianych list�w"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Wiele list�w"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Najni�szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Ni�szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Wy�szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Najwy�szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "Dzi� %k:%M"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %k:%M"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "Aktualizowanie zestawienia list�w"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
 msgstr "Nale�ne "
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Flag Status"
 msgstr "Stan"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Oznaczony"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Oryginalne po�o�enie"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Odebrany"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Rozmiar"
 
-#: mail/message-tag-followup.c:1
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Telefon kontaktowy"
 
-#: mail/message-tag-followup.c:1
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Prze�lij"
 
-#: mail/message-tag-followup.c:1
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:1
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Informacje o �r�dle"
 
-#: mail/message-tag-followup.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Prze�lij"
 
-#: mail/message-tag-followup.c:1
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: mail/message-tag-followup.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Wszystkim"
 
-#: mail/message-tag-followup.c:1
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Podgl�d"
 
-#: mail/message-tag-followup.c:1
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Zako�czone"
+
+#: 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 "Wyczy��"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Nale�ne "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Oznaczony"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Analizowanie folder�w pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Analizowanie g��wnych folder�w na \"%s\""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subskrybowanie folderu \"%s\""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odsubskrybowywanie folderu \"%s\""
 
-#: mail/subscribe-dialog.c:1 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.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 "Folder"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Zapisz w folderze..."
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Nie wybrano serwera"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Wybierz serwer."
 
@@ -13462,77 +13574,77 @@ msgstr "Wybierz serwer."
 msgid "All folders"
 msgstr "Wszystkie foldery"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:2
 #, fuzzy
 msgid "Apri file"
 msgstr "Kwiecie�"
 
-#: mail/subscribe-dialog.glade.h:1 ui/evolution-comp-editor.xml.h:1
+#: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Zamknij"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:4
 msgid "Display Options"
 msgstr "Opcje wy�wietlania"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:5
 msgid "Folders whose names begin with:"
 msgstr "Foldery o nazwach rozpoczynaj�cych si� od:"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Zarz�dzanie subskrybcjami"
 
-#: mail/subscribe-dialog.glade.h:1 ui/evolution-subscribe.xml.h:1
+#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Od�wie� list�"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:8
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Usuni�ty"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:9
 #, fuzzy
 msgid "Salve file"
 msgstr "Wyb�r pliku"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:10
 msgid "_Subscribe"
 msgstr "_Zasubskrybuj"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:11
 msgid "_Unsubscribe"
 msgstr "O_dsubskrybuj"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Configuration control for the Evolution Summary."
 msgstr "Formant konfiguracji Zestawienia Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Konfiguracja  wygl�du Zestawienia Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
 msgid "Evolution Summary component."
 msgstr "Komponent Zestawienia Evolution."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
 #, fuzzy
 msgid "Factory for Evolution Summary's configuration control."
 msgstr "Generator formantu zada� Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
 #, fuzzy
 msgid "Factory for the Evolution Summary component."
 msgstr "Generator komponentu zestawienia poczty."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
 msgid "Summary Preferences"
 msgstr "Ustawienia zestawienia"
 
@@ -13540,9827 +13652,9827 @@ msgstr "Ustawienia zestawienia"
 msgid "Aarhus"
 msgstr "Aarhus"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2
 msgid "Abakan"
 msgstr "Abakan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:3
 msgid "Abbotsford"
 msgstr "Abbotsford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:4
 msgid "Aberdeen"
 msgstr "Aberdeen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:5
 msgid "Abha"
 msgstr "Abha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:6
 msgid "Abilene"
 msgstr "Abilene"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:7
 msgid "Abingdon"
 msgstr "Abingdon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:8
 msgid "Abu Dhabi"
 msgstr "Abu Dhabi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:9
 msgid "Abu Dhabi - Bateen"
 msgstr "Abu Dhabi - Bateen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:10
 msgid "Acajutla"
 msgstr "Acajutla"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:11
 msgid "Acapulco"
 msgstr "Acapulco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:12
 msgid "Acarigua"
 msgstr "Acarigua"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:13
 msgid "Adak"
 msgstr "Adak"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:14
 msgid "Adana"
 msgstr "Adana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:15
 msgid "Adana/Incirlik"
 msgstr "Adana/Incirlik"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:16
 msgid "Adelaide"
 msgstr "Adelaide"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:17
 msgid "Aden"
 msgstr "Aden"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:18
 msgid "Adrar"
 msgstr "Adrar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:19
 msgid "Aeroparque"
 msgstr "Aeroparque"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:20
 msgid "Aeropuerto del Norte"
 msgstr "Aeropuerto del Norte"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:21
 msgid "Afonsos"
 msgstr "Afonsos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:22
 msgid "Africa"
 msgstr "Africa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:23
 msgid "Afyon"
 msgstr "Afyon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:24
 msgid "Agen"
 msgstr "Agen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:25
 msgid "Aguascaliantes"
 msgstr "Aguascaliantes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:26
 msgid "Ahmadabad"
 msgstr "Ahmadabad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:27
 msgid "Ahwaz"
 msgstr "Ahwaz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:28
 msgid "Ainsworth"
 msgstr "Ainsworth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:29
 msgid "Air Force"
 msgstr "Air Force"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:30
 msgid "Ajaccio/Campo dell'Oro"
 msgstr "Ajaccio/Campo dell'Oro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:31
 msgid "Akeno Ab"
 msgstr "Akeno Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:32
 msgid "Akita Airport"
 msgstr "Akita Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:33
 msgid "Akron"
 msgstr "Akron"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:34
 msgid "Akrotiri"
 msgstr "Akrotiri"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:35
 msgid "Alabama"
 msgstr "Alabama"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:36
 msgid "Al Ahsa"
 msgstr "Al Ahsa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:37
 msgid "Al Ain"
 msgstr "Al Ain"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:38
 msgid "Alamogordo"
 msgstr "Alamogordo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:39
 msgid "Alamosa"
 msgstr "Alamosa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:40
 msgid "Alaska"
 msgstr "Alaska"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:41
 msgid "Al Baha"
 msgstr "Al Baha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:43
 msgid "Albany"
 msgstr "Albany"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:44
 msgid "Albenga"
 msgstr "Albenga"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:45
 msgid "Alberta"
 msgstr "Alberta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:46
 msgid "Alborg"
 msgstr "Alborg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:47
 msgid "Albuquerque"
 msgstr "Albuquerque"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:48
 msgid "Alderney"
 msgstr "Alderney"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:49
 msgid "Alesund"
 msgstr "Alesund"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:50
 msgid "Alexandria"
 msgstr "Alexandria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:51
 msgid "Alexandria-Esler"
 msgstr "Alexandria-Esler"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:52
 msgid "Alexandria/Nouzha"
 msgstr "Alexandria/Nouzha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:53
 msgid "Alexandroupolis"
 msgstr "Alexandroupolis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:55
 msgid "Alghero"
 msgstr "Alghero"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:56
 msgid "Algona"
 msgstr "Algona"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:57
 msgid "Alicante"
 msgstr "Alicante"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:58
 msgid "Alice"
 msgstr "Alice"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:59
 msgid "Alice Springs"
 msgstr "Alice Springs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:60
 msgid "Al-Jouf"
 msgstr "Al-Jouf"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:61
 msgid "Allentown"
 msgstr "Allentown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:62
 msgid "Alliance"
 msgstr "Alliance"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:63
 msgid "Alma"
 msgstr "Alma"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:64
 msgid "Almeria"
 msgstr "Almeria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:65
 msgid "Alpena"
 msgstr "Alpena"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:66
 msgid "Al Qaysumah"
 msgstr "Al Qaysumah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:67
 msgid "Alta"
 msgstr "Alta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:68
 msgid "Altamira"
 msgstr "Altamira"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:69
 msgid "Alton"
 msgstr "Alton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:70
 msgid "Altoona"
 msgstr "Altoona"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:71
 msgid "Alturas"
 msgstr "Alturas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:72
 msgid "Altus"
 msgstr "Altus"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:73
 msgid "Amami Airport"
 msgstr "Amami Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:74
 msgid "Amapala"
 msgstr "Amapala"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:75
 msgid "Amarillo"
 msgstr "Amarillo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:76
 msgid "Amasya"
 msgstr "Amasya"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:77
 msgid "Ambler"
 msgstr "Ambler"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:78
 msgid "Amelia"
 msgstr "Amelia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:79
 msgid "Amendola"
 msgstr "Amendola"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:80
 msgid "Ames"
 msgstr "Ames"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:81
 msgid "Amritsar"
 msgstr "Amritsar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:82
 msgid "Amsterdam"
 msgstr "Amsterdam"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:83
 msgid "Anadyr"
 msgstr "Anadyr"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:84
 msgid "Anaktuvuk"
 msgstr "Anaktuvuk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:85
 msgid "Anapa"
 msgstr "Anapa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:86
 msgid "Anchorage"
 msgstr "Anchorage"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:87
 msgid "Anchorage - Elmendorf AFB"
 msgstr "Anchorage - Elmendorf AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:88
 msgid "Ancona"
 msgstr "Ancona"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:89
 msgid "Andahuayla"
 msgstr "Andahuayla"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:90
 msgid "Anderson"
 msgstr "Anderson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:91
 msgid "Andoya"
 msgstr "Andoya"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:92
 msgid "Andravida"
 msgstr "Andravida"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:93
 msgid "Andrews AFB"
 msgstr "Andrews AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:94
 msgid "Angleton"
 msgstr "Angleton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:95
 msgid "Aniak"
 msgstr "Aniak"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:96
 msgid "Ankara/Esenboga"
 msgstr "Ankara/Esenboga"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:97
 msgid "Ankara/Etimesgut"
 msgstr "Ankara/Etimesgut"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:98
 msgid "Annaba"
 msgstr "Annaba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:99
 msgid "Ann Arbor"
 msgstr "Ann Arbor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:100
 msgid "Annette"
 msgstr "Annette"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:101
 msgid "Anniston"
 msgstr "Anniston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:102
 msgid "Antalya"
 msgstr "Antalya"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:103
 msgid "Antartica"
 msgstr "Antartica"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:104
 msgid "Antigo"
 msgstr "Antigo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:105
 msgid "Antigua"
 msgstr "Antigua"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:106
 msgid "Antigua and Barbuda"
 msgstr "Antigua and Barbuda"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:107
 msgid "Antofagasta"
 msgstr "Antofagasta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:108
 msgid "Antwerpen/Deurne"
 msgstr "Antwerpen/Deurne"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:109
 msgid "Aomori Airport"
 msgstr "Aomori Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:110
 msgid "Apalachicola"
 msgstr "Apalachicola"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:111
 msgid "Appleton"
 msgstr "Appleton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:112
 msgid "Aquadilla"
 msgstr "Aquadilla"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:113
 msgid "Aracaju"
 msgstr "Aracaju"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:114
 msgid "Arad"
 msgstr "Arad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:115
 msgid "Arar"
 msgstr "Arar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:116
 msgid "Araxos"
 msgstr "Araxos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:117
 msgid "Arcata"
 msgstr "Arcata"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:118
 msgid "Ardmore"
 msgstr "Ardmore"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:119
 msgid "Arequipa"
 msgstr "Arequipa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:121
 msgid "Arica"
 msgstr "Arica"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:122
 msgid "Arizona"
 msgstr "Arizona"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:123
 msgid "Arkansas"
 msgstr "Arkansas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:124
 msgid "Arkhangelsk"
 msgstr "Arkhangelsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:125
 msgid "Arlington"
 msgstr "Arlington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:126
 msgid "Artigas"
 msgstr "Artigas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:127
 msgid "Asahikawa Ab"
 msgstr "Asahikawa Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:128
 msgid "Asahikawa Airport"
 msgstr "Asahikawa Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:129
 msgid "Ashburnam"
 msgstr "Ashburnam"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:130
 msgid "Asheville"
 msgstr "Asheville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:131
 msgid "Ashfield"
 msgstr "Ashfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:132
 msgid "Ashiya Ab"
 msgstr "Ashiya Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:133
 msgid "Ashland"
 msgstr "Ashland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:134
 msgid "Asia"
 msgstr "Asia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:135
 msgid "Aspen"
 msgstr "Aspen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:136
 msgid "Asswan"
 msgstr "Asswan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:137
 msgid "Astoria"
 msgstr "Astoria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:138
 msgid "Astrakhan"
 msgstr "Astrakhan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:139
 msgid "Asturias"
 msgstr "Asturias"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:140
 msgid "Asuncion"
 msgstr "Asuncion"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:141
 msgid "Athens"
 msgstr "Athens"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:142
 msgid "Athinai"
 msgstr "Athinai"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:143
 msgid "Atlanta"
 msgstr "Atlanta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:144
 msgid "Atlantic"
 msgstr "Atlantic"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:145
 msgid "Atlantic City"
 msgstr "Atlantic City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:146
 msgid "Atsugi US NAS"
 msgstr "Atsugi US NAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:147
 msgid "Auburn"
 msgstr "Auburn"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:148
 msgid "Auckland"
 msgstr "Auckland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:149
 msgid "Augsburg"
 msgstr "Augsburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:150
 msgid "Augusta"
 msgstr "Augusta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:151
 msgid "Aurora"
 msgstr "Aurora"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:152
 msgid "Austin"
 msgstr "Austin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:153
 msgid "Australasia"
 msgstr "Australasia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:156
 msgid "Avalon"
 msgstr "Avalon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:157
 msgid "Aviano"
 msgstr "Aviano"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:158
 msgid "Ayacucho"
 msgstr "Ayacucho"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:159
 msgid "Bage"
 msgstr "Bage"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:160
 msgid "Bagotville"
 msgstr "Bagotville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:162
 msgid "Bahia Blanca"
 msgstr "Bahia Blanca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:163
 msgid "Bahias de Huatulco"
 msgstr "Bahias de Huatulco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:165
 msgid "Baker City"
 msgstr "Baker City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:166
 msgid "Bakersfield"
 msgstr "Bakersfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:167
 msgid "Bale-Mulhouse"
 msgstr "Bale-Mulhouse"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:168
 msgid "Balikesir"
 msgstr "Balikesir"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:169
 msgid "Balikesir/Bandirma"
 msgstr "Balikesir/Bandirma"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:170
 msgid "Ball Mountain"
 msgstr "Ball Mountain"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:171
 msgid "Baltimore"
 msgstr "Baltimore"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:172
 msgid "Baltimore-Glen Burnie"
 msgstr "Baltimore-Glen Burnie"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:173
 msgid "Banak"
 msgstr "Banak"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:174
 msgid "Bandarabbass"
 msgstr "Bandarabbass"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:175
 msgid "Bangor"
 msgstr "Bangor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:176
 msgid "Baracoa"
 msgstr "Baracoa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:177
 msgid "Barbers Point"
 msgstr "Barbers Point"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:178
 msgid "Barcelona"
 msgstr "Barcelona"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:179
 msgid "Bardufoss"
 msgstr "Bardufoss"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:180
 msgid "Bar Harbor"
 msgstr "Bar Harbor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:181
 msgid "Bari"
 msgstr "Bari"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:182
 msgid "Bariloche"
 msgstr "Bariloche"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:183
 msgid "Barinas"
 msgstr "Barinas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:184
 msgid "Barking Sand"
 msgstr "Barking Sand"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:185
 msgid "Barksdale"
 msgstr "Barksdale"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:186
 msgid "Barnaul"
 msgstr "Barnaul"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:187
 msgid "Barquisimeto"
 msgstr "Barquisimeto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:188
 msgid "Barranquilla/Ernestocortissoz"
 msgstr "Barranquilla/Ernestocortissoz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:189
 msgid "Barrow"
 msgstr "Barrow"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:190
 msgid "Barter Island"
 msgstr "Barter Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:191
 msgid "Bartlesville"
 msgstr "Bartlesville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:192
 msgid "Bartow"
 msgstr "Bartow"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:193
 msgid "Bastia"
 msgstr "Bastia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:194
 msgid "Batesville"
 msgstr "Batesville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:195
 msgid "Batman"
 msgstr "Batman"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:196
 msgid "Baton Rouge"
 msgstr "Baton Rouge"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:197
 msgid "Battle Creek"
 msgstr "Battle Creek"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:198
 msgid "Battle Mountain"
 msgstr "Battle Mountain"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:199
 msgid "Bauru"
 msgstr "Bauru"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:200
 msgid "Bayamo"
 msgstr "Bayamo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:201
 msgid "Bayreuth"
 msgstr "Bayreuth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:202
 msgid "Beatrice"
 msgstr "Beatrice"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:203
 msgid "Beaufort"
 msgstr "Beaufort"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:204
 msgid "Beaumont"
 msgstr "Beaumont"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:205
 msgid "Beaumont-Port Arthur"
 msgstr "Beaumont-Port Arthur"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:206
 msgid "Beauvais-Tille"
 msgstr "Beauvais-Tille"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:207
 msgid "Beauvechain"
 msgstr "Beauvechain"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:208
 msgid "Beckley"
 msgstr "Beckley"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:209
 msgid "Bedford"
 msgstr "Bedford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:210
 msgid "Beijing"
 msgstr "Beijing"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:211
 msgid "Beirut"
 msgstr "Beirut"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:212
 msgid "Beja"
 msgstr "Beja"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:213
 msgid "Belem"
 msgstr "Belem"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:214
 msgid "Belfast/Aldergrove"
 msgstr "Belfast/Aldergrove"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:215
 msgid "Belfast/Harbour"
 msgstr "Belfast/Harbour"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:217
 msgid "Belgorod"
 msgstr "Belgorod"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:219
 msgid "Belleville"
 msgstr "Belleville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:220
 msgid "Bellingham"
 msgstr "Bellingham"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:221
 msgid "Belmar-Farmingdale"
 msgstr "Belmar-Farmingdale"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:222
 msgid "Belo Horizonte"
 msgstr "Belo Horizonte"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:223
 msgid "Belo Horizonte Apt"
 msgstr "Belo Horizonte Apt"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:224
 msgid "Bemidji"
 msgstr "Bemidji"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:225
 msgid "Benbecula"
 msgstr "Benbecula"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:226
 msgid "Benina"
 msgstr "Benina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:227
 msgid "Benton Harbor"
 msgstr "Benton Harbor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:228
 msgid "Bentonville"
 msgstr "Bentonville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:229
 msgid "Beograd"
 msgstr "Beograd"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:230
 msgid "Bergamo"
 msgstr "Bergamo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:231
 msgid "Bergen"
 msgstr "Bergen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:232
 msgid "Bergstrom AFB"
 msgstr "Bergstrom AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:233
 msgid "Berlevag"
 msgstr "Berlevag"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:234
 msgid "Berlin"
 msgstr "Berlin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:235
 msgid "Berlin-Tegel"
 msgstr "Berlin-Tegel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:236
 msgid "Berlin-Tempelhof"
 msgstr "Berlin-Tempelhof"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:237
 msgid "Bern"
 msgstr "Bern"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:238
 msgid "Bethel"
 msgstr "Bethel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:239
 msgid "Bethlehem Airport"
 msgstr "Bethlehem Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:240
 msgid "Bettles"
 msgstr "Bettles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:241
 msgid "Beverly"
 msgstr "Beverly"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:242
 msgid "Biarritz-Bayonne"
 msgstr "Biarritz-Bayonne"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:243
 msgid "Bicycle Lake"
 msgstr "Bicycle Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:244
 msgid "Biggin Hill"
 msgstr "Biggin Hill"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:245
 msgid "Big Piney"
 msgstr "Big Piney"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:246
 msgid "Big River Lake"
 msgstr "Big River Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:247
 msgid "Bilbao"
 msgstr "Bilbao"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:248
 msgid "Billings"
 msgstr "Billings"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:249
 msgid "Billund"
 msgstr "Billund"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:250
 msgid "Binghamton"
 msgstr "Binghamton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:251
 msgid "Birmingham"
 msgstr "Birmingham"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:252
 msgid "Bisha"
 msgstr "Bisha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:253
 msgid "Bishop"
 msgstr "Bishop"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:254
 msgid "Bismark"
 msgstr "Bismark"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:255
 msgid "Blackpool"
 msgstr "Blackpool"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:256
 msgid "Blagoveschensk"
 msgstr "Blagoveschensk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:257
 msgid "Blanding"
 msgstr "Blanding"
 
 # [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:258
 msgid "Block Island"
 msgstr "Block Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:259
 msgid "Bloemfontein J. B. M. Hertzog "
 msgstr "Bloemfontein J. B. M. Hertzog "
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:260
 msgid "Bloomington"
 msgstr "Bloomington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:261
 msgid "Blue Canyon"
 msgstr "Blue Canyon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:262
 msgid "Bluefield"
 msgstr "Bluefield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:263
 msgid "Bluefields"
 msgstr "Bluefields"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:264
 msgid "Blythe"
 msgstr "Blythe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:265
 msgid "Boa Vista"
 msgstr "Boa Vista"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:266
 msgid "Bocas del Toro"
 msgstr "Bocas del Toro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:267
 msgid "Bodo"
 msgstr "Bodo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:268
 msgid "Bogota/Eldorado"
 msgstr "Bogota/Eldorado"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:269
 msgid "Boise"
 msgstr "Boise"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:271
 msgid "Bologna"
 msgstr "Bologna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:272
 msgid "Bolzano"
 msgstr "Bolzano"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:273
 msgid "Bombay/Santacruz"
 msgstr "Bombay/Santacruz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:274
 msgid "Boone"
 msgstr "Boone"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:275
 msgid "Bordeaux"
 msgstr "Bordeaux"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:276
 msgid "Borger"
 msgstr "Borger"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:277
 msgid "Bornholm"
 msgstr "Bornholm"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:278
 msgid "Boscombe Down"
 msgstr "Boscombe Down"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:279
 msgid "Bosnia-Herzegovina"
 msgstr "Bosnia-Herzegovina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:280
 msgid "Boston"
 msgstr "Boston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:281
 msgid "Boulmer"
 msgstr "Boulmer"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:282
 msgid "Bourges"
 msgstr "Bourges"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:283
 msgid "Bournemouth"
 msgstr "Bournemouth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:284
 msgid "Bowling Green"
 msgstr "Bowling Green"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:285
 msgid "Bozeman"
 msgstr "Bozeman"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:286
 msgid "Bradford"
 msgstr "Bradford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:287
 msgid "Bradshaw Field"
 msgstr "Bradshaw Field"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:288
 msgid "Brainerd"
 msgstr "Brainerd"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:289
 msgid "Brasilia"
 msgstr "Brasilia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:290
 msgid "Brasschaat"
 msgstr "Brasschaat"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:291
 msgid "Bratislava"
 msgstr "Bratislava"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:292
 msgid "Bratsk"
 msgstr "Bratsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:293
 msgid "Braunschweig"
 msgstr "Braunschweig"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:295
 msgid "Bremen"
 msgstr "Bremen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:296
 msgid "Bremerton"
 msgstr "Bremerton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:297
 msgid "Brest"
 msgstr "Brest"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:298
 msgid "Bridgeport"
 msgstr "Bridgeport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:299
 msgid "Brindisi"
 msgstr "Brindisi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:300
 msgid "Brisbane"
 msgstr "Brisbane"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:301
 msgid "Bristol"
 msgstr "Bristol"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:302
 msgid "British Columbia"
 msgstr "British Columbia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:303
 msgid "Brno"
 msgstr "Brno"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:304
 msgid "Broadus"
 msgstr "Broadus"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:305
 msgid "Broken Bow"
 msgstr "Broken Bow"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:306
 msgid "Bronnoysund"
 msgstr "Bronnoysund"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:307
 msgid "Brookings"
 msgstr "Brookings"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:308
 msgid "Brooksville"
 msgstr "Brooksville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:309
 msgid "Broome"
 msgstr "Broome"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:310
 msgid "Brownsville"
 msgstr "Brownsville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:311
 msgid "Brunswick"
 msgstr "Brunswick"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:312
 msgid "Brussels-National Airport"
 msgstr "Brussels-National Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:313
 msgid "Bryansk"
 msgstr "Bryansk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:314
 msgid "Bryce Canyon"
 msgstr "Bryce Canyon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:315
 msgid "Bucaramanga/Palonegro"
 msgstr "Bucaramanga/Palonegro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:316
 msgid "Bucuresti"
 msgstr "Bucuresti"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:317
 msgid "Bucuresti-Otopeni"
 msgstr "Bucuresti-Otopeni"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:318
 msgid "Budapest"
 msgstr "Budapest"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:319
 msgid "Buffalo"
 msgstr "Buffalo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:321
 msgid "Bullfrog"
 msgstr "Bullfrog"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:322
 msgid "Burbank"
 msgstr "Burbank"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:323
 msgid "Burgas"
 msgstr "Burgas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:324
 msgid "Burley"
 msgstr "Burley"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:325
 msgid "Burlington"
 msgstr "Burlington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:326
 msgid "Burnet"
 msgstr "Burnet"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:327
 msgid "Burns"
 msgstr "Burns"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:328
 msgid "Bursa"
 msgstr "Bursa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:329
 msgid "Burwell"
 msgstr "Burwell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:330
 msgid "Butte"
 msgstr "Butte"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:331
 msgid "Caen-Carpiquet"
 msgstr "Caen-Carpiquet"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:332
 msgid "Cagliari"
 msgstr "Cagliari"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:333
 msgid "Cairns"
 msgstr "Cairns"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:334
 msgid "Cairo"
 msgstr "Cairo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:335
 msgid "Calabozo"
 msgstr "Calabozo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:336
 msgid "Calcutta/Dum Dum"
 msgstr "Calcutta/Dum Dum"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:337
 msgid "Caldwell"
 msgstr "Caldwell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:338
 msgid "Calgary"
 msgstr "Calgary"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:339
 msgid "Cali/Alfonso Bonillaaragon"
 msgstr "Cali/Alfonso Bonillaaragon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:340
 msgid "Caliente"
 msgstr "Caliente"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:341
 msgid "California"
 msgstr "California"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:342
 msgid "Calvi-Ste-Catherine"
 msgstr "Calvi-Ste-Catherine"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:343
 msgid "Camaguey"
 msgstr "Camaguey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:344
 msgid "Camarillo"
 msgstr "Camarillo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:345
 msgid "Cambridge"
 msgstr "Cambridge"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:346
 msgid "Cameron"
 msgstr "Cameron"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:347
 msgid "Camiri"
 msgstr "Camiri"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:348
 msgid "Campeche"
 msgstr "Campeche"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:349
 msgid "Campinas"
 msgstr "Campinas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:350
 msgid "Campo"
 msgstr "Campo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:351
 msgid "Campo Grande"
 msgstr "Campo Grande"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:352
 msgid "Camp Stanley/H-207"
 msgstr "Camp Stanley/H-207"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:353
 msgid "Canaan"
 msgstr "Canaan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:355
 msgid "Canarias/Fuerteventura"
 msgstr "Canarias/Fuerteventura"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:356
 msgid "Canarias/Gran Canaria"
 msgstr "Canarias/Gran Canaria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:357
 msgid "Canarias/Hierro"
 msgstr "Canarias/Hierro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:358
 msgid "Canarias/Lanzarote"
 msgstr "Canarias/Lanzarote"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:359
 msgid "Canarias/La Palma"
 msgstr "Canarias/La Palma"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:360
 msgid "Canarias/Tenerife Norte"
 msgstr "Canarias/Tenerife Norte"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:361
 msgid "Canarias/Tenerife Sur"
 msgstr "Canarias/Tenerife Sur"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:362
 msgid "Canberra"
 msgstr "Canberra"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:363
 msgid "Cancun"
 msgstr "Cancun"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:364
 msgid "Cannes-Mandelieu"
 msgstr "Cannes-Mandelieu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:365
 msgid "Cantwell"
 msgstr "Cantwell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:366
 msgid "Cape Girardeau"
 msgstr "Cape Girardeau"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:367
 msgid "Cape Hatteras"
 msgstr "Cape Hatteras"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:368
 msgid "Cape Lisburne"
 msgstr "Cape Lisburne"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:369
 msgid "Cape Newenham"
 msgstr "Cape Newenham"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:370
 msgid "Cape Romanzoff"
 msgstr "Cape Romanzoff"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:371
 msgid "Cape Town D. F. Malan "
 msgstr "Cape Town D. F. Malan "
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:372
 msgid "Capitan Corbeta"
 msgstr "Capitan Corbeta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:373
 msgid "Capo Mele"
 msgstr "Capo Mele"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:374
 msgid "Caracas La Carlota"
 msgstr "Caracas La Carlota"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:375
 msgid "Caracas Maiquetia"
 msgstr "Caracas Maiquetia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:376
 msgid "Caravelas"
 msgstr "Caravelas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:377
 msgid "Carbondale"
 msgstr "Carbondale"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:378
 msgid "Cardiff"
 msgstr "Cardiff"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:379
 msgid "Caribou"
 msgstr "Caribou"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:380
 msgid "Carlisle"
 msgstr "Carlisle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:381
 msgid "Carlsbad"
 msgstr "Carlsbad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:382
 msgid "Carroll"
 msgstr "Carroll"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:383
 msgid "Cartagena/Rafael Nunez"
 msgstr "Cartagena/Rafael Nunez"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:384
 msgid "Casa Granda"
 msgstr "Casa Granda"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:385
 msgid "Cascade"
 msgstr "Cascade"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:386
 msgid "Casper"
 msgstr "Casper"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:387
 msgid "Catacamas"
 msgstr "Catacamas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:388
 msgid "Catania"
 msgstr "Catania"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:390
 msgid "Cayo Largo del Sur"
 msgstr "Cayo Largo del Sur"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:391
 msgid "Cazaux"
 msgstr "Cazaux"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:392
 msgid "Cecil NAS"
 msgstr "Cecil NAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:393
 msgid "Cedar City"
 msgstr "Cedar City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:394
 msgid "Cedar Rapids"
 msgstr "Cedar Rapids"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:395
 msgid "Central and South America"
 msgstr "Central and South America"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:396
 msgid "Cervia"
 msgstr "Cervia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:397
 msgid "Chacarita"
 msgstr "Chacarita"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:398
 msgid "Chadron"
 msgstr "Chadron"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:399
 msgid "Challis"
 msgstr "Challis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:400
 msgid "Chamberlain"
 msgstr "Chamberlain"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:401
 msgid "Chambery"
 msgstr "Chambery"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:402
 msgid "Champaign"
 msgstr "Champaign"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:403
 msgid "Chandalar Lake"
 msgstr "Chandalar Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:404
 msgid "Chandler"
 msgstr "Chandler"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:405
 msgid "Chania"
 msgstr "Chania"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:406
 msgid "Chanute"
 msgstr "Chanute"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:407
 msgid "Chariton"
 msgstr "Chariton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:408
 msgid "Charleroi-Brussels South"
 msgstr "Charleroi-Brussels South"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:409
 msgid "Charles City"
 msgstr "Charles City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:410
 msgid "Charleston"
 msgstr "Charleston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:411
 msgid "Charlotte"
 msgstr "Charlotte"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:412
 msgid "Charlottesville"
 msgstr "Charlottesville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:413
 msgid "Chatham"
 msgstr "Chatham"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:414
 msgid "Chattanooga"
 msgstr "Chattanooga"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:415
 msgid "Cheboksary"
 msgstr "Cheboksary"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:416
 msgid "Cheju"
 msgstr "Cheju"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:417
 msgid "Chelyabinsk"
 msgstr "Chelyabinsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:418
 msgid "Chengdu"
 msgstr "Chengdu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:419
 msgid "Cherbourg"
 msgstr "Cherbourg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:420
 msgid "Cherry Point"
 msgstr "Cherry Point"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:421
 msgid "Chetumal"
 msgstr "Chetumal"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:422
 msgid "Cheyenne"
 msgstr "Cheyenne"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:423
 msgid "Chiang Kai Shek"
 msgstr "Chiang Kai Shek"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:424
 msgid "Chia Tung"
 msgstr "Chia Tung"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:425
 msgid "Chiayi"
 msgstr "Chiayi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:426
 msgid "Chicago-DuPage"
 msgstr "Chicago-DuPage"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:427
 msgid "Chicago-Lakefront"
 msgstr "Chicago-Lakefront"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:428
 msgid "Chicago-Midway"
 msgstr "Chicago-Midway"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:429
 msgid "Chicago-O'Hare"
 msgstr "Chicago-O'Hare"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:430
 msgid "Chichijima"
 msgstr "Chichijima"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:431
 msgid "Chiclayo"
 msgstr "Chiclayo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:432
 msgid "Chico"
 msgstr "Chico"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:433
 msgid "Chicopee Falls"
 msgstr "Chicopee Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:434
 msgid "Chievres"
 msgstr "Chievres"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:435
 msgid "Chihhang"
 msgstr "Chihhang"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:436
 msgid "Chihuahua"
 msgstr "Chihuahua"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:437
 msgid "Childress"
 msgstr "Childress"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:439
 msgid "China Lake"
 msgstr "China Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:440
 msgid "Chinandega"
 msgstr "Chinandega"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:441
 msgid "Chinmem/Shatou"
 msgstr "Chinmem/Shatou"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:442
 msgid "Chino"
 msgstr "Chino"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:443
 msgid "Chippewa County"
 msgstr "Chippewa County"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:444
 msgid "Chita"
 msgstr "Chita"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:445
 msgid "Chitose Ab"
 msgstr "Chitose Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:446
 msgid "Chitose ASDF"
 msgstr "Chitose ASDF"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:447
 msgid "Chofu Airport"
 msgstr "Chofu Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:448
 msgid "Choluteca"
 msgstr "Choluteca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:449
 msgid "Chongju Ab"
 msgstr "Chongju Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:450
 msgid "Christchurch"
 msgstr "Christchurch"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:452
 msgid "Chulitna"
 msgstr "Chulitna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:453
 msgid "Churchill"
 msgstr "Churchill"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:454
 msgid "Churchill Falls"
 msgstr "Churchill Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:455
 msgid "Cincinnati"
 msgstr "Cincinnati"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:456
 msgid "Circle City"
 msgstr "Circle City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:457
 msgid "Ciudad Bolivar"
 msgstr "Ciudad Bolivar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:458
 msgid "Ciudad del Carmen"
 msgstr "Ciudad del Carmen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:459
 msgid "Ciudad Juarez"
 msgstr "Ciudad Juarez"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:460
 msgid "Ciudad Obregon"
 msgstr "Ciudad Obregon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:461
 msgid "Ciudad Victoria"
 msgstr "Ciudad Victoria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:462
 msgid "Clarinda"
 msgstr "Clarinda"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:463
 msgid "Clarion"
 msgstr "Clarion"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:464
 msgid "Clarksburg"
 msgstr "Clarksburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:465
 msgid "Clayton"
 msgstr "Clayton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:466
 msgid "Clayton Lake"
 msgstr "Clayton Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:467
 msgid "Clermont-Ferrand"
 msgstr "Clermont-Ferrand"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:468
 msgid "Cleveland"
 msgstr "Cleveland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:469
 msgid "Cleveland/Cuyahoga"
 msgstr "Cleveland/Cuyahoga"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:470
 msgid "Cleveland-Lakefront"
 msgstr "Cleveland-Lakefront"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:471
 msgid "Clinton"
 msgstr "Clinton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:472
 msgid "Clovis-Cannon AFB"
 msgstr "Clovis-Cannon AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:473
 msgid "Cobija"
 msgstr "Cobija"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:474
 msgid "Cochabamba"
 msgstr "Cochabamba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:475
 msgid "Cocoa Beach"
 msgstr "Cocoa Beach"
 
 # [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:476
 msgid "Cocos Island"
 msgstr "Cocos Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:477
 msgid "Cody"
 msgstr "Cody"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:478
 msgid "Coeur d'Alene"
 msgstr "Coeur d'Alene"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:479
 msgid "Cold Bay"
 msgstr "Cold Bay"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:480
 msgid "Colima"
 msgstr "Colima"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:481
 msgid "College Station"
 msgstr "College Station"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:482
 msgid "Colmar-Meyenheim"
 msgstr "Colmar-Meyenheim"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:484
 msgid "Colonia"
 msgstr "Colonia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:485
 msgid "Colorado"
 msgstr "Colorado"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:486
 msgid "Colorado Springs"
 msgstr "Colorado Springs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:487
 msgid "Columbia"
 msgstr "Columbia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:488
 msgid "Columbia-McEntire"
 msgstr "Columbia-McEntire"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:489
 msgid "Columbus"
 msgstr "Columbus"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:490
 msgid "Columbus-Fort Benning"
 msgstr "Columbus-Fort Benning"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:491
 msgid "Columbus-Gahanna"
 msgstr "Columbus-Gahanna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:492
 msgid "Columbus-OSU"
 msgstr "Columbus-OSU"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:493
 msgid "Columbus-W Point-Starkville"
 msgstr "Columbus-W Point-Starkville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:494
 msgid "Colville"
 msgstr "Colville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:495
 msgid "Comodoro Rivadavia"
 msgstr "Comodoro Rivadavia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:496
 msgid "Comox"
 msgstr "Comox"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:497
 msgid "Conceicao Do Araguaia"
 msgstr "Conceicao Do Araguaia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:498
 msgid "Concepcion"
 msgstr "Concepcion"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:499
 msgid "Concord"
 msgstr "Concord"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:500
 msgid "Concordia"
 msgstr "Concordia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:501
 msgid "Connaught"
 msgstr "Connaught"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:502
 msgid "Connecticut"
 msgstr "Connecticut"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:503
 msgid "Conroe"
 msgstr "Conroe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:504
 msgid "Constantine"
 msgstr "Constantine"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:505
 msgid "Copper Harbor"
 msgstr "Copper Harbor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:506
 msgid "Cordoba"
 msgstr "Cordoba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:507
 msgid "Cordova"
 msgstr "Cordova"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:508
 msgid "Cork"
 msgstr "Cork"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:509
 msgid "Coro"
 msgstr "Coro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:510
 msgid "Corona"
 msgstr "Corona"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:511
 msgid "Corpus Christi"
 msgstr "Corpus Christi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:512
 msgid "Corpus Christi NAS"
 msgstr "Corpus Christi NAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:513
 msgid "Corrientes"
 msgstr "Corrientes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:514
 msgid "Corsicana"
 msgstr "Corsicana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:515
 msgid "Cortez"
 msgstr "Cortez"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:516
 msgid "Corumba"
 msgstr "Corumba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:518
 msgid "Cotulla"
 msgstr "Cotulla"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:519
 msgid "Council Bluffs"
 msgstr "Council Bluffs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:520
 msgid "Coventry"
 msgstr "Coventry"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:521
 msgid "Covington"
 msgstr "Covington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:522
 msgid "Cozumel"
 msgstr "Cozumel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:523
 msgid "Craig"
 msgstr "Craig"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:524
 msgid "Cranfield"
 msgstr "Cranfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:525
 msgid "Crescent City"
 msgstr "Crescent City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:526
 msgid "Creston"
 msgstr "Creston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:527
 msgid "Crestview"
 msgstr "Crestview"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:529
 msgid "Cross City"
 msgstr "Cross City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:530
 msgid "Crossville"
 msgstr "Crossville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:531
 msgid "Crotone"
 msgstr "Crotone"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:533
 msgid "Cuba Awrs"
 msgstr "Cuba Awrs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:534
 msgid "Cuernavaca"
 msgstr "Cuernavaca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:535
 msgid "Cuiaba"
 msgstr "Cuiaba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:536
 msgid "Culdrose"
 msgstr "Culdrose"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:537
 msgid "Culiacan"
 msgstr "Culiacan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:538
 msgid "Cumana"
 msgstr "Cumana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:539
 msgid "Cumberland"
 msgstr "Cumberland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:540
 msgid "Curitiba"
 msgstr "Curitiba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:541
 msgid "Curitiba Apt"
 msgstr "Curitiba Apt"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:542
 msgid "Custer"
 msgstr "Custer"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:543
 msgid "Cut Bank"
 msgstr "Cut Bank"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:544
 msgid "Cuzco"
 msgstr "Cuzco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:547
 msgid "Dagali"
 msgstr "Dagali"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:548
 msgid "Daggett"
 msgstr "Daggett"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:549
 msgid "Dalhart"
 msgstr "Dalhart"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:550
 msgid "Dalian"
 msgstr "Dalian"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:551
 msgid "Dallas-Addison"
 msgstr "Dallas-Addison"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:552
 msgid "Dallas-Fort Worth"
 msgstr "Dallas-Fort Worth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:553
 msgid "Dallas-Love Field"
 msgstr "Dallas-Love Field"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:554
 msgid "Dallas-Redbird"
 msgstr "Dallas-Redbird"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:555
 msgid "Da Nang"
 msgstr "Da Nang"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:556
 msgid "Danbury"
 msgstr "Danbury"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:557
 msgid "Danville"
 msgstr "Danville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:558
 msgid "Dar-El-Beida"
 msgstr "Dar-El-Beida"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:559
 msgid "Davenport"
 msgstr "Davenport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:560
 msgid "David"
 msgstr "David"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:561
 msgid "Dawadmi"
 msgstr "Dawadmi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:562
 msgid "Dayton"
 msgstr "Dayton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:563
 msgid "Daytona Beach"
 msgstr "Daytona Beach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:564
 msgid "Dayton-Fairborn"
 msgstr "Dayton-Fairborn"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:565
 msgid "Dayton-South Airport"
 msgstr "Dayton-South Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:566
 msgid "Dead Horse"
 msgstr "Dead Horse"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:567
 msgid "Deauville-Saint-Gatien"
 msgstr "Deauville-Saint-Gatien"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:568
 msgid "Decatur"
 msgstr "Decatur"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:569
 msgid "Decimomannu"
 msgstr "Decimomannu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:570
 msgid "Decorah"
 msgstr "Decorah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:571
 msgid "Deelen"
 msgstr "Deelen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:572
 msgid "Dekalb/Peachtree"
 msgstr "Dekalb/Peachtree"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:573
 msgid "Delaware"
 msgstr "Delaware"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:574
 msgid "Del Bajio"
 msgstr "Del Bajio"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:575
 msgid "Del Rio"
 msgstr "Del Rio"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:576
 msgid "Delta"
 msgstr "Delta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:577
 msgid "Deming"
 msgstr "Deming"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:578
 msgid "Den Helder/De Kooy"
 msgstr "Den Helder/De Kooy"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:579
 msgid "Denison"
 msgstr "Denison"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:581
 msgid "Denton"
 msgstr "Denton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:582
 msgid "Denver"
 msgstr "Denver"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:583
 msgid "Denver-Aurora"
 msgstr "Denver-Aurora"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:584
 msgid "Denver-Broomfield"
 msgstr "Denver-Broomfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:585
 msgid "Denver-Cherry Knolls"
 msgstr "Denver-Cherry Knolls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:586
 msgid "Desert Rock"
 msgstr "Desert Rock"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:587
 msgid "Des Moines"
 msgstr "Des Moines"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:588
 msgid "Destin"
 msgstr "Destin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:589
 msgid "Detroit"
 msgstr "Detroit"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:590
 msgid "Detroit Lakes"
 msgstr "Detroit Lakes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:591
 msgid "Detroit-Taylor"
 msgstr "Detroit-Taylor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:592
 msgid "Detroit/Ypsilanti"
 msgstr "Detroit/Ypsilanti"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:593
 msgid "Devils Lake"
 msgstr "Devils Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:594
 msgid "Devils Lake (2)"
 msgstr "Devils Lake (2)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:595
 msgid "Dhahran"
 msgstr "Dhahran"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:596
 msgid "Dickinson"
 msgstr "Dickinson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:597
 msgid "Dijon"
 msgstr "Dijon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:598
 msgid "Dillingham"
 msgstr "Dillingham"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:599
 msgid "Dillon"
 msgstr "Dillon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:600
 msgid "Dinard"
 msgstr "Dinard"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:601
 msgid "District of Columbia"
 msgstr "District of Columbia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:602
 msgid "Diyarbakir"
 msgstr "Diyarbakir"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:603
 msgid "Dnipropetrovsk"
 msgstr "Dnipropetrovsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:604
 msgid "Dobbiaco"
 msgstr "Dobbiaco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:605
 msgid "Dodge City"
 msgstr "Dodge City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:606
 msgid "Doha"
 msgstr "Doha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:607
 msgid "Dole"
 msgstr "Dole"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:609
 msgid "Donetsk"
 msgstr "Donetsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:610
 msgid "Dongsha"
 msgstr "Dongsha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:611
 msgid "Dongshi"
 msgstr "Dongshi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:612
 msgid "Don Torcuato"
 msgstr "Don Torcuato"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:613
 msgid "Dortmund-Wickede"
 msgstr "Dortmund-Wickede"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:614
 msgid "Dothan"
 msgstr "Dothan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:615
 msgid "Douglas"
 msgstr "Douglas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:616
 msgid "Dover"
 msgstr "Dover"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:617
 msgid "Dresden-Klotzsche"
 msgstr "Dresden-Klotzsche"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:618
 msgid "Drummond"
 msgstr "Drummond"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:619
 msgid "Dubai"
 msgstr "Dubai"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:620
 msgid "Dubbo"
 msgstr "Dubbo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:621
 msgid "Dublin"
 msgstr "Dublin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:622
 msgid "Du Bois"
 msgstr "Du Bois"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:623
 msgid "Dubrovnik"
 msgstr "Dubrovnik"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:624
 msgid "Dubuque"
 msgstr "Dubuque"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:625
 msgid "Dugway"
 msgstr "Dugway"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:626
 msgid "Duluth"
 msgstr "Duluth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:627
 msgid "Dundee"
 msgstr "Dundee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:628
 msgid "Durango"
 msgstr "Durango"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:629
 msgid "Durango Awrs"
 msgstr "Durango Awrs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:630
 msgid "Durazno"
 msgstr "Durazno"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:631
 msgid "Durban Louis Botha "
 msgstr "Durban Louis Botha "
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:632
 msgid "Dusseldorf"
 msgstr "Dusseldorf"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:633
 msgid "Dutch Harbor"
 msgstr "Dutch Harbor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:634
 msgid "Dyersburg"
 msgstr "Dyersburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:635
 msgid "Eagle"
 msgstr "Eagle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:636
 msgid "Eagle Range"
 msgstr "Eagle Range"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:637
 msgid "East London"
 msgstr "East London"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:638
 msgid "East Midlands"
 msgstr "East Midlands"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:639
 msgid "East St Louis"
 msgstr "East St Louis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:640
 msgid "Eau Claire"
 msgstr "Eau Claire"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:642
 msgid "Edinburgh"
 msgstr "Edinburgh"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:643
 msgid "Edmonton"
 msgstr "Edmonton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:644
 msgid "Edmonton/Villeneuve"
 msgstr "Edmonton/Villeneuve"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:645
 msgid "Eduardo Gomes International"
 msgstr "Eduardo Gomes International"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:646
 msgid "Edwards AFB"
 msgstr "Edwards AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:647
 msgid "Egilsstadir"
 msgstr "Egilsstadir"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:648
 msgid "Eglin"
 msgstr "Eglin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:649
 msgid "Eglington/Londonderry"
 msgstr "Eglington/Londonderry"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:651
 msgid "Eindhoven"
 msgstr "Eindhoven"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:652
 msgid "Ekofisk"
 msgstr "Ekofisk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:653
 msgid "Elazig"
 msgstr "Elazig"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:654
 msgid "El Centro"
 msgstr "El Centro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:655
 msgid "El Dorado"
 msgstr "El Dorado"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:656
 msgid "Elefsis"
 msgstr "Elefsis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:657
 msgid "Elfin Cove"
 msgstr "Elfin Cove"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:658
 msgid "Elizabeth City"
 msgstr "Elizabeth City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:659
 msgid "Elk City"
 msgstr "Elk City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:660
 msgid "Elkhart"
 msgstr "Elkhart"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:661
 msgid "Elkins"
 msgstr "Elkins"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:662
 msgid "Elko"
 msgstr "Elko"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:663
 msgid "Elmira"
 msgstr "Elmira"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:664
 msgid "El Monte"
 msgstr "El Monte"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:665
 msgid "El Paso"
 msgstr "El Paso"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:667
 msgid "El Salvador Int."
 msgstr "El Salvador Int."
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:668
 msgid "Elsenborn"
 msgstr "Elsenborn"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:669
 msgid "Ely"
 msgstr "Ely"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:670
 msgid "Emmonak"
 msgstr "Emmonak"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:671
 msgid "Emporia"
 msgstr "Emporia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:672
 msgid "Enid"
 msgstr "Enid"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:673
 msgid "Enid/Woodring"
 msgstr "Enid/Woodring"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:674
 msgid "Enosburg Falls"
 msgstr "Enosburg Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:675
 msgid "Ephrata"
 msgstr "Ephrata"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:676
 msgid "Ercan"
 msgstr "Ercan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:677
 msgid "Erie"
 msgstr "Erie"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:678
 msgid "Erzurum"
 msgstr "Erzurum"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:679
 msgid "Esbjerg"
 msgstr "Esbjerg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:680
 msgid "Escanaba"
 msgstr "Escanaba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:681
 msgid "Esfahan"
 msgstr "Esfahan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:682
 msgid "Eskisehir"
 msgstr "Eskisehir"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:683
 msgid "Estherville"
 msgstr "Estherville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:685
 msgid "Eugene"
 msgstr "Eugene"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:686
 msgid "Eureka"
 msgstr "Eureka"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:687
 msgid "Europe"
 msgstr "Europe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:688
 msgid "Evanston"
 msgstr "Evanston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:689
 msgid "Evansville"
 msgstr "Evansville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:690
 msgid "Everett"
 msgstr "Everett"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:691
 msgid "Evergreen"
 msgstr "Evergreen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:692
 msgid "Evreux-Fauville"
 msgstr "Evreux-Fauville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:693
 msgid "Exeter"
 msgstr "Exeter"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:694
 msgid "Ezeiza"
 msgstr "Ezeiza"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:695
 msgid "Fagernes"
 msgstr "Fagernes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:696
 msgid "Fairbanks"
 msgstr "Fairbanks"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:697
 msgid "Fairchild"
 msgstr "Fairchild"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:698
 msgid "Fairfield"
 msgstr "Fairfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:699
 msgid "Fairmont"
 msgstr "Fairmont"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:700
 msgid "Fallon"
 msgstr "Fallon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:701
 msgid "Falls City"
 msgstr "Falls City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:702
 msgid "Falmouth-Otis AFB"
 msgstr "Falmouth-Otis AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:703
 msgid "Farbanks/Eielson AFB"
 msgstr "Farbanks/Eielson AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:704
 msgid "Fargo"
 msgstr "Fargo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:705
 msgid "Farmingdale"
 msgstr "Farmingdale"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:706
 msgid "Farmington"
 msgstr "Farmington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:707
 msgid "Farmville"
 msgstr "Farmville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:708
 msgid "Faro"
 msgstr "Faro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:709
 msgid "Fayetteville"
 msgstr "Fayetteville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:710
 msgid "Feng Nin"
 msgstr "Feng Nin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:711
 msgid "Fergus Falls"
 msgstr "Fergus Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:712
 msgid "Fernando De Noronha"
 msgstr "Fernando De Noronha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:713
 msgid "Ferrara"
 msgstr "Ferrara"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:714
 msgid "Figari"
 msgstr "Figari"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:715
 msgid "Findlay"
 msgstr "Findlay"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:717
 msgid "Firenze"
 msgstr "Firenze"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:718
 msgid "Fitchburg"
 msgstr "Fitchburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:719
 msgid "Flagstaff"
 msgstr "Flagstaff"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:720
 msgid "Flint"
 msgstr "Flint"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:721
 msgid "Flippin"
 msgstr "Flippin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:722
 msgid "Florence"
 msgstr "Florence"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:723
 msgid "Florennes"
 msgstr "Florennes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:724
 msgid "Flores"
 msgstr "Flores"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:725
 msgid "Florianopolis"
 msgstr "Florianopolis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:726
 msgid "Florida"
 msgstr "Florida"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:727
 msgid "Floro"
 msgstr "Floro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:728
 msgid "Fond Du Lac"
 msgstr "Fond Du Lac"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:729
 msgid "Forde/Bringeland"
 msgstr "Forde/Bringeland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:730
 msgid "Forli"
 msgstr "Forli"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:731
 msgid "Formosa"
 msgstr "Formosa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:732
 msgid "Fortaleza"
 msgstr "Fortaleza"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:733
 msgid "Fort Belvoir"
 msgstr "Fort Belvoir"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:734
 msgid "Fort Benning"
 msgstr "Fort Benning"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:735
 msgid "Fort Bragg"
 msgstr "Fort Bragg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:736
 msgid "Fort Campbell"
 msgstr "Fort Campbell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:737
 msgid "Fort Carson"
 msgstr "Fort Carson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:738
 msgid "Fort Collins"
 msgstr "Fort Collins"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:739
 msgid "Fort Collins/Lovel"
 msgstr "Fort Collins/Lovel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:740
 msgid "Fort Dodge"
 msgstr "Fort Dodge"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:741
 msgid "Fort Drum"
 msgstr "Fort Drum"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:742
 msgid "Fort Eustis"
 msgstr "Fort Eustis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:743
 msgid "Fort Greely/Allen AAF"
 msgstr "Fort Greely/Allen AAF"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:744
 msgid "Fort Huachuca"
 msgstr "Fort Huachuca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:745
 msgid "Fort Knox"
 msgstr "Fort Knox"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:746
 msgid "Fort Lauderdale"
 msgstr "Fort Lauderdale"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:747
 msgid "Fort Lauderdale (International)"
 msgstr "Fort Lauderdale (International)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:748
 msgid "Fort Leonard"
 msgstr "Fort Leonard"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:749
 msgid "Fort Lewis"
 msgstr "Fort Lewis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:750
 msgid "Fort Madison"
 msgstr "Fort Madison"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:751
 msgid "Fort Meade"
 msgstr "Fort Meade"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:752
 msgid "Fort Myers (Page Field)"
 msgstr "Fort Myers (Page Field)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:753
 msgid "Fort Myers (Southwest Florida International)"
 msgstr "Fort Myers (Southwest Florida International)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:754
 msgid "Fort Polk-Leesville"
 msgstr "Fort Polk-Leesville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:755
 msgid "Fort Riley"
 msgstr "Fort Riley"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:756
 msgid "Fort Sill"
 msgstr "Fort Sill"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:757
 msgid "Fort Smith"
 msgstr "Fort Smith"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:758
 msgid "Fort Stewart"
 msgstr "Fort Stewart"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:759
 msgid "Fort Stockton"
 msgstr "Fort Stockton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:760
 msgid "Fort Wayne"
 msgstr "Fort Wayne"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:761
 msgid "Fort Worth-Alliance"
 msgstr "Fort Worth-Alliance"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:762
 msgid "Fort Worth-Meacham"
 msgstr "Fort Worth-Meacham"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:763
 msgid "Fort Worth NAS"
 msgstr "Fort Worth NAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:764
 msgid "Fourchon"
 msgstr "Fourchon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:765
 msgid "Foz Do Iguacu"
 msgstr "Foz Do Iguacu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:767
 msgid "Frankfort"
 msgstr "Frankfort"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:768
 msgid "Frankfurt/Main"
 msgstr "Frankfurt/Main"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:769
 msgid "Franklin"
 msgstr "Franklin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:770
 msgid "Fredericton"
 msgstr "Fredericton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:771
 msgid "Freeport"
 msgstr "Freeport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:772
 msgid "Frenchville"
 msgstr "Frenchville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:773
 msgid "Fresno"
 msgstr "Fresno"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:774
 msgid "Fresno-Chandler"
 msgstr "Fresno-Chandler"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:775
 msgid "Friday Harbor"
 msgstr "Friday Harbor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:776
 msgid "Friedrichshafen"
 msgstr "Friedrichshafen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:777
 msgid "Frigg"
 msgstr "Frigg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:778
 msgid "Frontone"
 msgstr "Frontone"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:779
 msgid "Frosinone"
 msgstr "Frosinone"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:780
 msgid "Fryeburg"
 msgstr "Fryeburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:781
 msgid "Fujairah"
 msgstr "Fujairah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:782
 msgid "Fuji Ab"
 msgstr "Fuji Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:783
 msgid "Fukue Airport"
 msgstr "Fukue Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:784
 msgid "Fukui Airport"
 msgstr "Fukui Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:785
 msgid "Fukuoka Airport"
 msgstr "Fukuoka Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:786
 msgid "Fullerton"
 msgstr "Fullerton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:787
 msgid "Funchal"
 msgstr "Funchal"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:788
 msgid "FYR Macedonia"
 msgstr "FYR Macedonia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:789
 msgid "Gadsden"
 msgstr "Gadsden"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:790
 msgid "Gage"
 msgstr "Gage"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:791
 msgid "Gainesville"
 msgstr "Gainesville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:792
 msgid "Galax-Hillsville"
 msgstr "Galax-Hillsville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:793
 msgid "Galbraith Lake"
 msgstr "Galbraith Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:794
 msgid "Galeao"
 msgstr "Galeao"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:795
 msgid "Galena"
 msgstr "Galena"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:796
 msgid "Galesburg"
 msgstr "Galesburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:797
 msgid "Gallup"
 msgstr "Gallup"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:798
 msgid "Galveston"
 msgstr "Galveston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:799
 msgid "Gambell"
 msgstr "Gambell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:800
 msgid "Gander"
 msgstr "Gander"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:801
 msgid "Garden City"
 msgstr "Garden City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:802
 msgid "Gary"
 msgstr "Gary"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:803
 msgid "Gassim"
 msgstr "Gassim"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:804
 msgid "Gatineau"
 msgstr "Gatineau"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:805
 msgid "Gaziantep"
 msgstr "Gaziantep"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:806
 msgid "Gdansk"
 msgstr "Gdansk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:807
 msgid "Geneve"
 msgstr "Geneve"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:808
 msgid "Genova"
 msgstr "Genova"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:809
 msgid "George Airport"
 msgstr "George Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:810
 msgid "Georgetown"
 msgstr "Georgetown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:813
 msgid "Ghardaia"
 msgstr "Ghardaia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:814
 msgid "Ghedi"
 msgstr "Ghedi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:816
 msgid "Gifu Ab"
 msgstr "Gifu Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:817
 msgid "Gila Bend"
 msgstr "Gila Bend"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:818
 msgid "Gillette"
 msgstr "Gillette"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:819
 msgid "Gilze-Rijen"
 msgstr "Gilze-Rijen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:820
 msgid "Gioia del Colle"
 msgstr "Gioia del Colle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:821
 msgid "Girona"
 msgstr "Girona"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:822
 msgid "Gizan"
 msgstr "Gizan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:823
 msgid "Glasgow"
 msgstr "Glasgow"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:824
 msgid "Glendive"
 msgstr "Glendive"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:825
 msgid "Glens Falls"
 msgstr "Glens Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:826
 msgid "Goiania"
 msgstr "Goiania"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:827
 msgid "Goldsboro"
 msgstr "Goldsboro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:828
 msgid "Goodland"
 msgstr "Goodland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:829
 msgid "Goose Bay"
 msgstr "Goose Bay"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:830
 msgid "Goteborg (Landvetter)"
 msgstr "Goteborg (Landvetter)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:831
 msgid "Goteborg (Save)"
 msgstr "Goteborg (Save)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:832
 msgid "Granada"
 msgstr "Granada"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:833
 msgid "Grand Canyon"
 msgstr "Grand Canyon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:834
 msgid "Grand Cayman"
 msgstr "Grand Cayman"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:835
 msgid "Grand Forks"
 msgstr "Grand Forks"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:836
 msgid "Grand Island"
 msgstr "Grand Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:837
 msgid "Grand Isle"
 msgstr "Grand Isle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:838
 msgid "Grand Junction"
 msgstr "Grand Junction"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:839
 msgid "Grand Marais"
 msgstr "Grand Marais"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:840
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:841
 msgid "Grandview"
 msgstr "Grandview"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:842
 msgid "Grangeville"
 msgstr "Grangeville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:843
 msgid "Grants"
 msgstr "Grants"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:844
 msgid "Graz"
 msgstr "Graz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:845
 msgid "Great Falls"
 msgstr "Great Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:847
 msgid "Greeley"
 msgstr "Greeley"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:848
 msgid "Green Bay"
 msgstr "Green Bay"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:849
 msgid "Green River"
 msgstr "Green River"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:850
 msgid "Greensboro"
 msgstr "Greensboro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:851
 msgid "Greenville"
 msgstr "Greenville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:852
 msgid "Greenville-Spartanburg"
 msgstr "Greenville-Spartanburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:853
 msgid "Greenwood"
 msgstr "Greenwood"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:854
 msgid "Grenoble-Saint-Geoirs"
 msgstr "Grenoble-Saint-Geoirs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:855
 msgid "Griffiss AFB"
 msgstr "Griffiss AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:856
 msgid "Groningen"
 msgstr "Groningen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:857
 msgid "Grosseto"
 msgstr "Grosseto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:858
 msgid "Groton"
 msgstr "Groton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:859
 msgid "Guadalajara"
 msgstr "Guadalajara"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:860
 msgid "Guadalupe Pass"
 msgstr "Guadalupe Pass"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:861
 msgid "Guanare"
 msgstr "Guanare"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:862
 msgid "Guangzhou"
 msgstr "Guangzhou"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:863
 msgid "Guantanamo"
 msgstr "Guantanamo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:864
 msgid "Guarany"
 msgstr "Guarany"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:865
 msgid "Guaratingueta"
 msgstr "Guaratingueta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:866
 msgid "Guarulhos"
 msgstr "Guarulhos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:868
 msgid "Guayaquil/Simon Bolivar"
 msgstr "Guayaquil/Simon Bolivar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:869
 msgid "Guaymas"
 msgstr "Guaymas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:870
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:871
 msgid "Guidonia"
 msgstr "Guidonia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:872
 msgid "Gulfport"
 msgstr "Gulfport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:873
 msgid "Gulkana"
 msgstr "Gulkana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:874
 msgid "Gullfax C"
 msgstr "Gullfax C"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:875
 msgid "Gunnison"
 msgstr "Gunnison"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:876
 msgid "Gunnison (2)"
 msgstr "Gunnison (2)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:877
 msgid "Guriat"
 msgstr "Guriat"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:878
 msgid "Gustavus"
 msgstr "Gustavus"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:879
 msgid "Guymon"
 msgstr "Guymon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:880
 msgid "Habana"
 msgstr "Habana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:881
 msgid "Hachijojima Airport"
 msgstr "Hachijojima Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:882
 msgid "Hachinohe Ab"
 msgstr "Hachinohe Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:883
 msgid "Hafr Al-Batin"
 msgstr "Hafr Al-Batin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:884
 msgid "Hagerstown"
 msgstr "Hagerstown"
 
 #. HAIL
-#: my-evolution/Locations.h:1 my-evolution/metar.c:1
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
 msgid "Hail"
 msgstr "Hail"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:886
 msgid "Hailey-Sun Valley"
 msgstr "Hailey-Sun Valley"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:887
 msgid "Haines"
 msgstr "Haines"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:889
 msgid "Hakodate Airport"
 msgstr "Hakodate Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:890
 msgid "Halifax"
 msgstr "Halifax"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:891
 msgid "Hamamatsu Ab"
 msgstr "Hamamatsu Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:892
 msgid "Hamburg"
 msgstr "Hamburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:893
 msgid "Hamburg-Finkenwerder"
 msgstr "Hamburg-Finkenwerder"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:894
 msgid "Hamilton"
 msgstr "Hamilton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:895
 msgid "Hammerfest"
 msgstr "Hammerfest"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:896
 msgid "Hampton"
 msgstr "Hampton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:897
 msgid "Hanamaki Airport"
 msgstr "Hanamaki Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:898
 msgid "Hancock"
 msgstr "Hancock"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:899
 msgid "Hangzhou"
 msgstr "Hangzhou"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:900
 msgid "Hanksville"
 msgstr "Hanksville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:901
 msgid "Hannover"
 msgstr "Hannover"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:902
 msgid "Ha Noi"
 msgstr "Ha Noi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:903
 msgid "Harbor Beach"
 msgstr "Harbor Beach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:904
 msgid "Harlingen"
 msgstr "Harlingen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:905
 msgid "Harlowton"
 msgstr "Harlowton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:906
 msgid "Harrisburg"
 msgstr "Harrisburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:907
 msgid "Harrison"
 msgstr "Harrison"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:908
 msgid "Harstad/Narvik/Evenes"
 msgstr "Harstad/Narvik/Evenes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:909
 msgid "Hartford"
 msgstr "Hartford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:910
 msgid "Hassi-Messaoud"
 msgstr "Hassi-Messaoud"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:911
 msgid "Hastings"
 msgstr "Hastings"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:912
 msgid "Haugesund"
 msgstr "Haugesund"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:913
 msgid "Havre"
 msgstr "Havre"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:914
 msgid "Hawaii"
 msgstr "Hawaii"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:915
 msgid "Hawthorne"
 msgstr "Hawthorne"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:916
 msgid "Hayden"
 msgstr "Hayden"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:917
 msgid "Hayes River"
 msgstr "Hayes River"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:918
 msgid "Hays"
 msgstr "Hays"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:919
 msgid "Hayward"
 msgstr "Hayward"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:920
 msgid "Healy River"
 msgstr "Healy River"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:921
 msgid "Helena"
 msgstr "Helena"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:922
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:923
 msgid "Henderson"
 msgstr "Henderson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:924
 msgid "Hengchun"
 msgstr "Hengchun"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:925
 msgid "Hermosillo"
 msgstr "Hermosillo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:926
 msgid "Hibbing"
 msgstr "Hibbing"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:927
 msgid "Hickory"
 msgstr "Hickory"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:928
 msgid "Hill City"
 msgstr "Hill City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:929
 msgid "Hillsboro"
 msgstr "Hillsboro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:930
 msgid "Hilo"
 msgstr "Hilo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:931
 msgid "Hinesville"
 msgstr "Hinesville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:932
 msgid "Hiroshima Airport"
 msgstr "Hiroshima Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:933
 msgid "Hobart"
 msgstr "Hobart"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:934
 msgid "Hobbs"
 msgstr "Hobbs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:935
 msgid "Ho Chi Minh"
 msgstr "Ho Chi Minh"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:936
 msgid "Hodeidah"
 msgstr "Hodeidah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:937
 msgid "Hof"
 msgstr "Hof"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:938
 msgid "Hoffman"
 msgstr "Hoffman"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:939
 msgid "Hofu Ab"
 msgstr "Hofu Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:940
 msgid "Hohenems"
 msgstr "Hohenems"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:941
 msgid "Holguin"
 msgstr "Holguin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:942
 msgid "Homer"
 msgstr "Homer"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:943
 msgid "Homestead AFB"
 msgstr "Homestead AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:944
 msgid "Hondo"
 msgstr "Hondo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:947
 msgid "Honningsvag"
 msgstr "Honningsvag"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:948
 msgid "Honolulu"
 msgstr "Honolulu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:949
 msgid "Hoonah"
 msgstr "Hoonah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:950
 msgid "Hoquiam"
 msgstr "Hoquiam"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:951
 msgid "Hot Springs"
 msgstr "Hot Springs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:952
 msgid "Houghton Lake"
 msgstr "Houghton Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:953
 msgid "Houlton"
 msgstr "Houlton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:954
 msgid "Houma"
 msgstr "Houma"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:955
 msgid "Houston-Bush"
 msgstr "Houston-Bush"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:956
 msgid "Houston-Clover"
 msgstr "Houston-Clover"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:957
 msgid "Houston-Ellington Field"
 msgstr "Houston-Ellington Field"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:958
 msgid "Houston-Hobby"
 msgstr "Houston-Hobby"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:959
 msgid "Houston-Hooks"
 msgstr "Houston-Hooks"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:960
 msgid "Howard AFB"
 msgstr "Howard AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:961
 msgid "Hsinchu"
 msgstr "Hsinchu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:962
 msgid "Huanuco"
 msgstr "Huanuco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:963
 msgid "Huehuetenango"
 msgstr "Huehuetenango"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:964
 msgid "Hulien"
 msgstr "Hulien"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:965
 msgid "Humberside"
 msgstr "Humberside"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:967
 msgid "Huntington"
 msgstr "Huntington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:968
 msgid "Huntsville"
 msgstr "Huntsville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:969
 msgid "Hurlburt"
 msgstr "Hurlburt"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:970
 msgid "Huron"
 msgstr "Huron"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:971
 msgid "Hutchinson"
 msgstr "Hutchinson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:972
 msgid "Hyakuri Ab"
 msgstr "Hyakuri Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:973
 msgid "Hyannis"
 msgstr "Hyannis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:974
 msgid "Hyderabad"
 msgstr "Hyderabad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:975
 msgid "Hyeres-Le Palyvestre"
 msgstr "Hyeres-Le Palyvestre"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:976
 msgid "Iasi"
 msgstr "Iasi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:977
 msgid "Ibiza"
 msgstr "Ibiza"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:979
 msgid "Ichikawa"
 msgstr "Ichikawa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:980
 msgid "Idaho"
 msgstr "Idaho"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:981
 msgid "Idaho Falls"
 msgstr "Idaho Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:982
 msgid "Iguazu"
 msgstr "Iguazu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:983
 msgid "Iki Airport"
 msgstr "Iki Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:984
 msgid "Ilan"
 msgstr "Ilan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:985
 msgid "Iliamna"
 msgstr "Iliamna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:986
 msgid "Illinois"
 msgstr "Illinois"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:987
 msgid "Imperial"
 msgstr "Imperial"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:988
 msgid "Imperial (2)"
 msgstr "Imperial (2)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:989
 msgid "Imperial Beach"
 msgstr "Imperial Beach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:990
 msgid "In Amenas"
 msgstr "In Amenas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:992
 msgid "Indiana"
 msgstr "Indiana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:993
 msgid "Indianapolis"
 msgstr "Indianapolis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:994
 msgid "Indian Springs"
 msgstr "Indian Springs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:995
 msgid "Innsbruck"
 msgstr "Innsbruck"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:996
 msgid "International Falls"
 msgstr "International Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:997
 msgid "Intracoastal"
 msgstr "Intracoastal"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:998
 msgid "Inverness"
 msgstr "Inverness"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:999
 msgid "Inyokern"
 msgstr "Inyokern"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1000
 msgid "Iowa"
 msgstr "Iowa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1001
 msgid "Iowa City"
 msgstr "Iowa City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1002
 msgid "Iqaluit"
 msgstr "Iqaluit"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1003
 msgid "Iquique/Diego Arac"
 msgstr "Iquique/Diego Arac"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1004
 msgid "Iquitos"
 msgstr "Iquitos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1005
 msgid "Iraklion"
 msgstr "Iraklion"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1006
 msgid "Iran, Islamic Republic of"
 msgstr "Iran, Islamic Republic of"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1008
 msgid "Iron Mountain"
 msgstr "Iron Mountain"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1009
 msgid "Ironwood"
 msgstr "Ironwood"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1010
 msgid "Iruma Ab"
 msgstr "Iruma Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1011
 msgid "Islamabad"
 msgstr "Islamabad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1012
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1013
 msgid "Islip"
 msgstr "Islip"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1014
 msgid "Istanbul"
 msgstr "Istanbul"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1015
 msgid "Itaituba"
 msgstr "Itaituba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1017
 msgid "Ithaca"
 msgstr "Ithaca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1018
 msgid "Ivano-Frankivsk"
 msgstr "Ivano-Frankivsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1019
 msgid "Iwakuni MCAS"
 msgstr "Iwakuni MCAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1020
 msgid "Iwojima"
 msgstr "Iwojima"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1021
 msgid "Ixtapa"
 msgstr "Ixtapa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1022
 msgid "Izmir/Adnan Menderes"
 msgstr "Izmir/Adnan Menderes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1023
 msgid "Izmir/Cigli"
 msgstr "Izmir/Cigli"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1024
 msgid "Izmit"
 msgstr "Izmit"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1025
 msgid "Izumo Airport"
 msgstr "Izumo Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1026
 msgid "Jackson"
 msgstr "Jackson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1027
 msgid "Jacksonville"
 msgstr "Jacksonville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1028
 msgid "Jacksonville-Craig Airport"
 msgstr "Jacksonville-Craig Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1029
 msgid "Jacksonville NAS"
 msgstr "Jacksonville NAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1030
 msgid "Jaffrey"
 msgstr "Jaffrey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1032
 msgid "Jamestown"
 msgstr "Jamestown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1033
 msgid "Janesville"
 msgstr "Janesville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1034
 msgid "Jan Smuts"
 msgstr "Jan Smuts"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1036
 msgid "Jeddah King Abdul Aziz International Airport"
 msgstr "Jeddah King Abdul Aziz International Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1037
 msgid "Jefferson City"
 msgstr "Jefferson City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1038
 msgid "Jerez"
 msgstr "Jerez"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1039
 msgid "Jersey"
 msgstr "Jersey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1040
 msgid "Jinotega"
 msgstr "Jinotega"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1041
 msgid "Johan A. Pengel"
 msgstr "Johan A. Pengel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1042
 msgid "Johnstown"
 msgstr "Johnstown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1043
 msgid "Jonesboro"
 msgstr "Jonesboro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1044
 msgid "Jonkoping"
 msgstr "Jonkoping"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1045
 msgid "Joplin"
 msgstr "Joplin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1047
 msgid "Juanjui"
 msgstr "Juanjui"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1048
 msgid "Juan Santamaria"
 msgstr "Juan Santamaria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1049
 msgid "Juigalpa"
 msgstr "Juigalpa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1050
 msgid "Jujuy"
 msgstr "Jujuy"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1051
 msgid "Juliaca"
 msgstr "Juliaca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1052
 msgid "Junction"
 msgstr "Junction"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1053
 msgid "Juneau"
 msgstr "Juneau"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1054
 msgid "Kadena Ab"
 msgstr "Kadena Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1055
 msgid "Kagoshima Airport"
 msgstr "Kagoshima Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1056
 msgid "Kahului"
 msgstr "Kahului"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1057
 msgid "Kailua-Kona"
 msgstr "Kailua-Kona"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1058
 msgid "Kake"
 msgstr "Kake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1059
 msgid "Kalamata"
 msgstr "Kalamata"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1060
 msgid "Kalamazoo"
 msgstr "Kalamazoo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1061
 msgid "Kalispell"
 msgstr "Kalispell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1062
 msgid "Kamigoto"
 msgstr "Kamigoto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1063
 msgid "Kaneohe"
 msgstr "Kaneohe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1064
 msgid "Kangshan"
 msgstr "Kangshan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1065
 msgid "Kanoya Ab"
 msgstr "Kanoya Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1066
 msgid "Kansai International Airport"
 msgstr "Kansai International Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1067
 msgid "Kansas"
 msgstr "Kansas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1068
 msgid "Kansas City"
 msgstr "Kansas City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1069
 msgid "Kansas City-Gladstone"
 msgstr "Kansas City-Gladstone"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1070
 msgid "Kaohsiung"
 msgstr "Kaohsiung"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1071
 msgid "Karachi"
 msgstr "Karachi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1072
 msgid "Karup"
 msgstr "Karup"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1073
 msgid "Kassel-Calden"
 msgstr "Kassel-Calden"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1074
 msgid "Kasumigaura Ab"
 msgstr "Kasumigaura Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1075
 msgid "Kasuminome Ab"
 msgstr "Kasuminome Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1076
 msgid "Katowice"
 msgstr "Katowice"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1077
 msgid "Kavala"
 msgstr "Kavala"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1078
 msgid "Kayseri"
 msgstr "Kayseri"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1079
 msgid "Kazan"
 msgstr "Kazan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1080
 msgid "Kearney"
 msgstr "Kearney"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1081
 msgid "Keene"
 msgstr "Keene"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1082
 msgid "Kefallinia"
 msgstr "Kefallinia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1083
 msgid "Keflavik"
 msgstr "Keflavik"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1084
 msgid "Kenai"
 msgstr "Kenai"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1085
 msgid "Kenosha"
 msgstr "Kenosha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1086
 msgid "Kentucky"
 msgstr "Kentucky"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1087
 msgid "Keokuk"
 msgstr "Keokuk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1088
 msgid "Kerkira"
 msgstr "Kerkira"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1089
 msgid "Kerman"
 msgstr "Kerman"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1090
 msgid "Ketchikan"
 msgstr "Ketchikan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1091
 msgid "Key West"
 msgstr "Key West"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1092
 msgid "Key West NAS"
 msgstr "Key West NAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1093
 msgid "Khabarovsk"
 msgstr "Khabarovsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1094
 msgid "Khamis Mushait"
 msgstr "Khamis Mushait"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1095
 msgid "Kharkiv"
 msgstr "Kharkiv"
 
 # [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1096
 msgid "Kikai Island"
 msgstr "Kikai Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1097
 msgid "Killeen"
 msgstr "Killeen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1098
 msgid "Killeen-Ft Hood"
 msgstr "Killeen-Ft Hood"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1099
 msgid "Killeen-Gray AAF"
 msgstr "Killeen-Gray AAF"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1100
 msgid "King Khaled International Airport"
 msgstr "King Khaled International Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1101
 msgid "Kingman"
 msgstr "Kingman"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1102
 msgid "King Salmon"
 msgstr "King Salmon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1103
 msgid "Kingston"
 msgstr "Kingston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1104
 msgid "Kingsville"
 msgstr "Kingsville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1105
 msgid "Kinloss"
 msgstr "Kinloss"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1106
 msgid "Kinston"
 msgstr "Kinston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1107
 msgid "Kirkenes"
 msgstr "Kirkenes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1108
 msgid "Kirksville"
 msgstr "Kirksville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1109
 msgid "Kiruna"
 msgstr "Kiruna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1110
 msgid "Kisarazu Ab"
 msgstr "Kisarazu Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1111
 msgid "Kishineu"
 msgstr "Kishineu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1112
 msgid "Kitakyushu Airport"
 msgstr "Kitakyushu Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1113
 msgid "Klagenfurt"
 msgstr "Klagenfurt"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1114
 msgid "Klamath Falls"
 msgstr "Klamath Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1115
 msgid "Klawock"
 msgstr "Klawock"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1116
 msgid "Kleine Brogel"
 msgstr "Kleine Brogel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1117
 msgid "Kliningrad"
 msgstr "Kliningrad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1118
 msgid "Knoxville"
 msgstr "Knoxville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1119
 msgid "Knoxville-Downtown"
 msgstr "Knoxville-Downtown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1120
 msgid "Kobenhavn/Kastrup"
 msgstr "Kobenhavn/Kastrup"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1121
 msgid "Kobenhavn/Roskilde"
 msgstr "Kobenhavn/Roskilde"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1122
 msgid "Kochi Airport"
 msgstr "Kochi Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1123
 msgid "Kodiak"
 msgstr "Kodiak"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1124
 msgid "Kogalniceanu"
 msgstr "Kogalniceanu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1125
 msgid "Kogalym"
 msgstr "Kogalym"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1126
 msgid "Koksijde"
 msgstr "Koksijde"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1127
 msgid "Kolding/Vandrup"
 msgstr "Kolding/Vandrup"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1128
 msgid "Koln/Bonn"
 msgstr "Koln/Bonn"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1129
 msgid "Komatsu Ab"
 msgstr "Komatsu Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1130
 msgid "Komatsujima Ab"
 msgstr "Komatsujima Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1131
 msgid "Konya"
 msgstr "Konya"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1132
 msgid "Korea, Democratic People's Republic of"
 msgstr "Korea, Democratic People's Republic of"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1133
 msgid "Korea, Republic of"
 msgstr "Korea, Republic of"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1134
 msgid "Kos"
 msgstr "Kos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1135
 msgid "Kotzebue"
 msgstr "Kotzebue"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1136
 msgid "Kozani"
 msgstr "Kozani"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1137
 msgid "Krakow"
 msgstr "Krakow"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1138
 msgid "Krasnodar"
 msgstr "Krasnodar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1139
 msgid "Krasnoyarsk"
 msgstr "Krasnoyarsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1140
 msgid "Kristiansand/Kjevik"
 msgstr "Kristiansand/Kjevik"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1141
 msgid "Kristiansund/Kvernberget"
 msgstr "Kristiansund/Kvernberget"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1142
 msgid "Kryviy Rig/Lozovatka"
 msgstr "Kryviy Rig/Lozovatka"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1143
 msgid "Kumamoto Airport"
 msgstr "Kumamoto Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1144
 msgid "Kunming"
 msgstr "Kunming"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1145
 msgid "Kushiro Airport"
 msgstr "Kushiro Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1147
 msgid "Kyiv/Boryspil"
 msgstr "Kyiv/Boryspil"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1148
 msgid "Kyiv/Zhulyany"
 msgstr "Kyiv/Zhulyany"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1149
 msgid "La Ceiba"
 msgstr "La Ceiba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1150
 msgid "Laconia"
 msgstr "Laconia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1151
 msgid "La Coruna"
 msgstr "La Coruna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1152
 msgid "La Crosse"
 msgstr "La Crosse"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1153
 msgid "La Esperanza"
 msgstr "La Esperanza"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1154
 msgid "Lafayette"
 msgstr "Lafayette"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1155
 msgid "La Grande"
 msgstr "La Grande"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1156
 msgid "Lahaina"
 msgstr "Lahaina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1157
 msgid "Lahore"
 msgstr "Lahore"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1158
 msgid "Lajes"
 msgstr "Lajes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1159
 msgid "La Junta"
 msgstr "La Junta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1160
 msgid "Lake Charles"
 msgstr "Lake Charles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1161
 msgid "Lake Hood"
 msgstr "Lake Hood"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1162
 msgid "Lakehurst"
 msgstr "Lakehurst"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1163
 msgid "Lakeland"
 msgstr "Lakeland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1164
 msgid "Lake Tahoe"
 msgstr "Lake Tahoe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1165
 msgid "Lakeview"
 msgstr "Lakeview"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1166
 msgid "Lamar"
 msgstr "Lamar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1167
 msgid "La Mesa"
 msgstr "La Mesa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1168
 msgid "Lamezia"
 msgstr "Lamezia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1169
 msgid "Lamoni"
 msgstr "Lamoni"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1170
 msgid "Lampedusa"
 msgstr "Lampedusa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1171
 msgid "Lanai"
 msgstr "Lanai"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1172
 msgid "Lancaster"
 msgstr "Lancaster"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1173
 msgid "Lander"
 msgstr "Lander"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1174
 msgid "Langebaanweg"
 msgstr "Langebaanweg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1175
 msgid "Langley AFB"
 msgstr "Langley AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1176
 msgid "Lannion"
 msgstr "Lannion"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1177
 msgid "Lansing"
 msgstr "Lansing"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1178
 msgid "Lanzhou"
 msgstr "Lanzhou"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1179
 msgid "La Paz"
 msgstr "La Paz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1180
 msgid "La Paz/Alto"
 msgstr "La Paz/Alto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1181
 msgid "Laramie"
 msgstr "Laramie"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1182
 msgid "Laredo"
 msgstr "Laredo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1183
 msgid "Larnaka"
 msgstr "Larnaka"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1184
 msgid "La Romana"
 msgstr "La Romana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1185
 msgid "Las Americas"
 msgstr "Las Americas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1186
 msgid "Las Tunas"
 msgstr "Las Tunas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1187
 msgid "Las Vegas"
 msgstr "Las Vegas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1188
 msgid "Latina"
 msgstr "Latina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1189
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
 # FIXME (cyba): skr�t klawiszowy
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libya"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "Lviv"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Middle East"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moscow Domodedovo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moscow Sheremetyevo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
 # [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka International Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "People's Republic of China"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr ""
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Russia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2211
 msgid "Tallinn"
 msgstr ""
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyo International Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo New International Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "United Arab Emirates "
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao Airport"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:1
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:1
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Folder zawieraj�cy Zestawienie Evolution"
 
-#: my-evolution/e-summary-calendar.c:1 my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
 msgid "Appointments"
 msgstr "Terminy"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:368
 msgid "No appointments"
 msgstr "Brak termin�w"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:404
 msgid "%k:%M %d %B"
 msgstr "%d %B, %k:%M"
 
 # [cyba] Wypada zostawi� ten format 12-godzinny, bo jest te� alternatywa (z %k) wybierana przez program
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:406
 msgid "%l:%M %d %B"
 msgstr "%d %B, %l:%M"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:424
 msgid "No description"
 msgstr "Brak opisu"
 
-#: my-evolution/e-summary-mail.c:1
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Zestawienie poczty"
 
-#: my-evolution/e-summary-mail.c:1 my-evolution/e-summary-mail.c:1
-#: shell/e-local-storage.c:1
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokalne foldery"
 
@@ -23369,1261 +23481,1261 @@ msgstr "Lokalne foldery"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:1
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-preferences.c:108
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr "EPGD:EPKK:EPWA"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "S�owo dnia Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Cytaty dnia"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Nowe �r�d�o nowo�ci"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Podaj URL �r�d�a nowo�ci, kt�re chcesz doda�"
 
-#: my-evolution/e-summary-rdf.c:1
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "B��d przy pobieraniu RDF-a"
 
-#: my-evolution/e-summary-rdf.c:1
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "�r�d�o nowo�ci"
 
-#: my-evolution/e-summary-shown.c:1
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:1
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr "Dodaj"
 
-#: my-evolution/e-summary-shown.c:1 my-evolution/e-summary-table.c:1
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�nieg"
 
-#: my-evolution/e-summary-tasks.c:1
+#: my-evolution/e-summary-tasks.c:312
 msgid "No tasks"
 msgstr "Brak zada�"
 
-#: my-evolution/e-summary-tasks.c:1
+#: my-evolution/e-summary-tasks.c:357
 msgid "(No Description)"
 msgstr "(Brak opisu)"
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Moja pogoda"
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Pogoda"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B, %Y"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Poczekaj chwil�..."
 
-#: my-evolution/e-summary.c:1 ui/my-evolution.xml.h:1
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Wydrukuj"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Wydrukowanie zestawienia nie powiod�o si�"
 
-#: my-evolution/main.c:1
+#: my-evolution/main.c:64
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent zestawienia wykonawczego nie m�g� zainicjowa� Bonobo.\n"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:29
 msgid " F"
 msgstr "�F"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:29
 msgid " C"
 msgstr "�C"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:33
 msgid "knots"
 msgstr "w�z�y"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:33
 msgid "kph"
 msgstr "km/h"
 
 # [cyba] mo�e raczej calHg??
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:38
 msgid "inHg"
 msgstr "inHg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:38
 msgid "mmHg"
 msgstr "mmHg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:41
 msgid "miles"
 msgstr "mile"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:41
 msgid "kilometers"
 msgstr "kilometry"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Czyste niebo"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
 msgstr "Fragmentaryczne chmury"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "Rzadkie chmury"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:47
 msgid "Few clouds"
 msgstr "Kilka chmur"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr "Zachmurzenie"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr "Niepoprawna warto��"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr "Zmienny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "P�noc"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "P�noc - p�nocny wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "P�nocny wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "Wsch�d - p�nocny wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "Wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "Wsch�d - po�udniowy wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "Po�udniowy wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "Po�udnie - po�udniowy wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "Po�udnie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "Po�udnie - po�udniowy zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "Po�udniowy zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "Zach�d - po�udniowy zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "Zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "Zach�d - p�nocny zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "P�nocny zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "P�noc - p�nocny zach�d"
 
 #. DRIZZLE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr "M�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr "Nadchodz�ca m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr "Lekka m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr "Umiarkowana m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr "Obfita m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr "S�aba m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr "�agodna m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr "Cz�ciowa m�awka"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr "Burza"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr "Wietrzna m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:137
 msgid "Showers"
 msgstr "Kr�tkotrwa�a m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr "Zbli�aj�ca si� m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr "Utrzymuj�ca si� m�awka"
 
 #. RAIN
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr "Deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr "Nadchodz�cy deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr "Lekki deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr "Umiarkowany deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr "Obfity deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr "S�aby deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr "�agodny deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr "Cz�ciowe opady deszczu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr "Szalej�ce opady deszczu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr "Kr�tkotrwa�y deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr "Zbli�aj�cy si� deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr "Utrzymuj�cy si� deszcz"
 
 #. SNOW
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr "�nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr "Nadchodz�cy �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr "Lekki �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr "Umiarkowany �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr "Obfity �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr "S�aby �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr "�agodny �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr "Cz�ciowe opady �niegu"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr "Burza �nie�na"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr "Szalej�ce opady �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr "Kr�tkotrwa�y �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr "Zbli�aj�cy si� �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr "Utrzymuj�cy si� �nieg"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr "Ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr "Nadchodz�ce ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr "Lekkie ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr "Umiarkowane ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr "Obfite ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr "S�abe ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr "�agodne ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr "Cz�ciowe ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr "Szalej�ce ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr "Kr�tkotrwa�e ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr "Zbli�aj�ce si� ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr "Utrzymuj�ce si� ziarna �niegu"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr "Kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr "Nadchodz�ce kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr "Nieco kryszta�k�w lodowych"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr "Umiarkowane kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr "Obfite kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr "�agodne kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr "Cz�ciowe kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr "Burza z kryszta�kami lodowymi"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr "Szalej�ce kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr "Kr�tkotrwa�e kryszta�ki lodu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr "Zbli�aj�ce si� kryszta�ki lodu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr "Utrzymuj�ce si� krzyszta�ki lodu"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr "Kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr "Nadchodz�ce kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr "Nieco kulek lodowych"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr "Umiarkowane kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr "Obfite kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr "S�abe kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr "�agodne kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr "Cz�ciowe kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr "Burza z kulkami lodowymi"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr "Szalej�ce kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr "Kr�tkotrwa�e kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr "Zbli�aj�ce si� kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr "Utrzymuj�ce si� kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Nadchodz�cy grad"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr "Lekki grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr "Umiarkowany grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr "Obfity grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr "S�aby grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr "�agodny grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr "Cz�ciowy grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr "Burza gradowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr "Szalej�cy grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr "Kr�tkotrwa�y grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr "Zbli�aj�cy si� grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr "Utrzymuj�cy si� grad"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr "Gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr "Nadchodz�cy gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr "Umiarkowany gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr "Obfity gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr "S�aby gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr "�agodny gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr "Cz�ciowy gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr "Ma�a burza gradowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr "Szalej�cy gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr "Kr�tkotrwa�y gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr "Zbli�aj�cy si� gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr "Utrzymuj�cy si� gradzik"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr "Nieznane opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr "Nadchodz�ce opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr "Lekkie opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr "Umiarkowane opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr "Obfite opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr "S�abe opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr "�agodne opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr "Cz�ciowe opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr "Nieznana burza"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr "Szalej�ce opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr "Kr�tkotrwa�e opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr "Zbli�aj�ce si� opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr "Utrzymuj�ce si� opady"
 
 #. MIST
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr "Mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr "Nadchodz�ca mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr "Lekka mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr "Umiarkowana mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr "G�sta mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr "S�aba mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr "�agodna mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr "Cz�ciowa mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr "Mgie�ka z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr "Zbli�aj�ca si� mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr "Utrzymuj�ca si� mgie�ka"
 
 #. FOG
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr "Mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr "Nadchodz�ca mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr "Lekka mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr "Umiarkowana mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr "G�sta mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr "S�aba mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr "�agodna mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr "Cz�ciowa mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr "Mg�a z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr "Zbli�aj�ca si� mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr "Utrzymuj�ca si� mg�a"
 
 #. SMOKE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr "Dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr "Nadchodz�cy dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr "Rzadki dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr "Umiarkowany dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr "G�sty dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr "S�aby dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr "�agodny dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr "Cz�ciowy dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:300
 msgid "Thunderous smoke"
 msgstr "Og�uszaj�cy dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr "Dym z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr "Zbli�aj�cy si� dym"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr "Popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr "Nadchodz�cy popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr "Umiarkowany popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr "G�sty popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr "S�aby popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr "�agodny popi� wulaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr "Cz�ciowy popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:315
 msgid "Thunderous volcanic ash"
 msgstr "Og�uszaj�cy popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr "Szalej�cy popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:317
 msgid "Showers of volcanic ash"
 msgstr "Kr�tkotrwa�y popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr "Zbli�aj�cy si� popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr "Utrzymuj�cy si� popi� wulkaniczny"
 
 #. SAND
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr "Piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr "Nadchodz�cy piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr "Lekki piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr "Umiarkowany piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr "Obfity piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr "�agodny piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr "Cz�ciowy piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr "Szalej�cy piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr "Zbli�aj�cy si� piasek"
 
 #. HAZE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:337
 msgid "Haze"
 msgstr "Zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr "Nadchodz�ce zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr "Lekkie zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr "Umiarkowane zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr "G�ste zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr "S�abe zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr "�agodne zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr "Cz�ciowe zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr "Zamglenie z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr "Zbli�aj�ce si� zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr "Utrzymuj�ce si� zamglenie"
 
 #. SPRAY
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:352
 msgid "Spray"
 msgstr "Py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:353
 msgid "Spray in the vicinity"
 msgstr "Nadchodz�cy py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:354
 msgid "Light spray"
 msgstr "Lekki py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:355
 msgid "Moderate spray"
 msgstr "Umiarkowany py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:356
 msgid "Heavy spray"
 msgstr "Obfity py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:357
 msgid "Shallow spray"
 msgstr "S�aby py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:358
 msgid "Patches of spray"
 msgstr "�agodny py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:359
 msgid "Partial spray"
 msgstr "Cz�ciowy py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:361
 msgid "Blowing spray"
 msgstr "Szalej�cy py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:363
 msgid "Drifting spray"
 msgstr "Zbli�aj�cy si� py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:364
 msgid "Freezing spray"
 msgstr "Utrzymuj�cy si� py� wodny"
 
 #. DUST
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr "Tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr "Nadchodz�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr "Lekkie tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr "Umiarkowane tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr "Obfite tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr "�agodne tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr "Cz�ciowe tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr "Szalej�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr "Zbli�aj�ce si� tumany kurzu"
 
 #. SQUALL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr "Nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr "Nadchodz�ca nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr "Lekka nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr "Umiarkowana nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr "Obfita nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr "�agodna nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr "Og�uszaj�ca nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr "Szalej�ca nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr "Zbli�aj�ca si� nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr "Utrzymuj�ca si� nawa�nica"
 
 #. SANDSTORM
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr "Burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr "Nadchodz�ca burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr "Lekka burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr "Umiarkowana burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr "Obfita burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr "S�aba burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr "�agodna burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr "Og�uszaj�ca burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr "Szalej�ca burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr "Zbli�aj�ca si� burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr "Utrzymuj�ca si� burza piaskowa"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr "Kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr "Nadchodz�ca kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr "Lekka kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr "Umiarkowana kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr "Obfita kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr "S�aba kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr "�agodna kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr "Og�uszaj�ca kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr "Szalej�ca kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr "Zbli�aj�ca si� kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr "Utrzymuj�ca si� kurzawa"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr "Tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr "Nadchodz�ca tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr "Lekka tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr "Umiarkowana tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr "G�sta tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr "S�aba tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr "�agodna tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr "Cz�ciowa tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr "Tr�ba powietrzna z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr "Zbli�aj�ca si� tr�ba powietrzna"
 
 #. TORNADO
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr "Nadchodz�ce tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr "Umiarkowane tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr "Rozszala�e tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr "Cz�ciowe tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr "Og�uszaj�ce tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr "Zbli�aj�ce si� tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr "Utrzymuj�ce si� tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr "Wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr "Nadchodz�ce wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr "Lekkie wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr "Umiarkowane wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr "Obfite wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr "S�abe wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr "�agodne wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr "Cz�ciowe wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr "Szalej�ce wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr "Zbli�aj�ce si� wiruj�ce tumany kurzu"
 
@@ -24631,92 +24743,92 @@ msgstr "Zbli�aj�ce si� wiruj�ce tumany kurzu"
 msgid "Add n_ews feed"
 msgstr "Dodaj �_r�d�o"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "_Celsjusza"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:4
 #, fuzzy
 msgid "Delete news feed"
 msgstr "W_szystkie �r�d�a nowo�ci:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Liczba dni wy�wietlanych jednocze�nie w kalendarzu"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "_Maksymalna liczba wy�wietlanych element�w:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Ustawienia �r�de� nowo�ci"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Jeden _miesi�c"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "J_eden tydzie�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "O_kres od�wie�ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "O_kres od�wie�ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "_Wy�wietlanie pe�nych �cie�ek folder�w"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Wy�wietlanie _wszystkich zada�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Wy�wietlanie _dzisiejszych zada�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Wy�wietlanie temperatur w skali:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Zadania "
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather Settings"
 msgstr "Ustawienia dotycz�ce pogody"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheita"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Pi�� dni"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "Pocz_ta"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "�r�d�a _nowo�ci"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Jeden dzie�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "P_lanowanie"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "Pogod_a"
 
@@ -24724,27 +24836,27 @@ msgstr "Pogod_a"
 msgid "Configuration control for Evolution folder settings."
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "Folder Settings"
 msgstr "Ustawienia folder�w"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
 msgid "The Evolution shell."
 msgstr "Pow�oka Evolution."
 
-#: shell/e-activity-handler.c:1
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Wy�wietl szczeg�y"
 
-#: shell/e-activity-handler.c:1
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Anuluj operacj�"
 
-#: shell/e-folder-dnd-bridge.c:1
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24753,37 +24865,37 @@ msgstr ""
 "Nie mo�na przenie�� folderu:\n"
 "%s"
 
-#: shell/e-folder-list.c:1 shell/evolution-folder-selector-button.c:1
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
 #, fuzzy, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "Otw�rz za pomoc� programu %s..."
 
-#: shell/e-folder-list.c:1
+#: shell/e-folder-list.c:312
 msgid "Add a Folder"
 msgstr "Dodanie folderu"
 
-#: shell/e-local-storage.c:1
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Szkice"
 
-#: shell/e-local-storage.c:1 shell/e-shell-view.c:1
-#: shell/e-shortcuts.c:1
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Nadchodz�ce"
 
-#: shell/e-local-storage.c:1
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Wychodz�ce"
 
-#: shell/e-local-storage.c:1
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Wys�ane"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalacja Evolution"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:130
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -24791,15 +24903,15 @@ msgstr ""
 "Uruchomiona w�a�nie nowa wersja Evolution wymaga zainstalowania\n"
 "dodatkowych plik�w w osobistym katalogu Evolution"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Kliknij \"OK\" aby zainstalowa� pliki lub \"Anuluj\" aby zako�czy�."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Nie mo�na poprawnie uaktualni� plik�w"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24810,7 +24922,7 @@ msgstr ""
 "%s\n"
 "B��d: %s"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24819,7 +24931,7 @@ msgstr ""
 "Wyst�pi� b��d przy kopiowaniu plik�w do\n"
 "\"%s\"."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -24830,7 +24942,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -24841,7 +24953,7 @@ msgstr ""
 "ma niew�a�ciwe uprawnienia. Ustaw prawa do jego odczytu\n"
 "oraz wykonania i uruchom Evolution ponownie."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -24852,7 +24964,7 @@ msgstr ""
 "plik %s.\n"
 "Usu� ten plik i uruchom Evolution ponownie."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24863,7 +24975,7 @@ msgstr ""
 "Przenie� go w inne miejsce, aby umo�liwi�\n"
 "instalacj� plik�w u�ytkownika Evolution."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -24876,7 +24988,7 @@ msgstr ""
 "jego usuni�cie.\n"
 "Czy chcesz usun�� ten katalog?"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24887,76 +24999,76 @@ msgstr ""
 "Evolution. Przenie� go w inne miejsce, aby umo�liwi�\n"
 "instalacj� plik�w u�ytkownika Evolution."
 
-#: shell/e-shell-about-box.c:1
+#: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Dostarczone przez"
 
-#: shell/e-shell-config-autocompletion.c:1
+#: shell/e-shell-config-autocompletion.c:106
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "Data zako�czenia"
 
-#: shell/e-shell-config-default-folders.c:1
+#: shell/e-shell-config-default-folders.c:133
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-config-folder-settings.c:1
+#: shell/e-shell-config-folder-settings.c:71
 #, fuzzy
 msgid "Default Folders"
 msgstr "Foldery specjalne"
 
-#: shell/e-shell-config-folder-settings.c:1
+#: shell/e-shell-config-folder-settings.c:74
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Filtrowanie folderu"
 
-#: shell/e-shell-config-folder-settings.c:1
+#: shell/e-shell-config-folder-settings.c:77
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "Lokalne foldery"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Nie mo�na skopiowa� folderu: %s"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:143
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "Nie mo�na przenie�� folderu: %s"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Nie mo�na przenie�� folderu do niego samego."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Nie mo�na skopiowa� folderu do niego samego."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:206
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Nie mo�na skopiowa� folderu do jego folderu podrz�dnego."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Wybierz folder, do kt�rego chcesz skopiowa� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopiowanie folderu"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Wybierz folder, do kt�rego chcesz przenie�� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Przeniesienie folderu"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24965,19 +25077,19 @@ msgstr ""
 "Nie mo�na usun�� folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Usuni�cie \"%s\""
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:407
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr ""
 "Nie mo�na usun�� folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24986,22 +25098,35 @@ msgstr ""
 "Nie mo�na zmieni� nazwy folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Zmiana nazwy folderu \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Zmiana nazwy folderu"
 
-#: shell/e-shell-folder-commands.c:1
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Podana nazwa folderu nie jest poprawna: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: 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 ""
+"Nie mo�na zmieni� nazwy folderu:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25010,24 +25135,24 @@ msgstr ""
 "Nie mo�na utworzy� podanego folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Utw�rz _nowy folder..."
 
-#: shell/e-shell-folder-selection-dialog.c:1
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nowy..."
 
-#: shell/e-shell-folder-title-bar.c:1 shell/e-shell-folder-title-bar.c:1
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Bez nazwy)"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run:"
 msgstr "Wybierz typ uruchamianego importera:"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -25041,24 +25166,11 @@ msgstr ""
 "Je�li nie znasz typu pliku, wybierz \"Automatycznie\", a Evolution spr�buje "
 "go rozpozna�."
 
-#: shell/e-shell-importer.c:1 shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Wybierz informacje, kt�re chcesz zaimportowa�:"
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:1
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importowanie %s\n"
-"Importer nie jest gotowy.\n"
-"Oczekiwanie przez 5 sekund przed ponowieniem."
-
-#: shell/e-shell-importer.c:1 shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25067,22 +25179,22 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie %d. elementu."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Plik %s nie istnieje."
 
-#: shell/e-shell-importer.c:1 shell/e-shell-importer.c:1
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 msgid "Evolution Error"
 msgstr "B��d Evolution"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25091,11 +25203,11 @@ msgstr ""
 "�aden z importer�w nie potrafi obs�u�y� pliku\n"
 "%s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importowanie"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25104,17 +25216,17 @@ msgstr ""
 "Importowanie %s.\n"
 "Rozpoczynanie %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "B��d przy uruchamianiu %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "B��d przy odczycie %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25123,31 +25235,31 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Wyb�r pliku"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Typ pliku:"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Import danych i ustawie� ze starszych program�w"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Import pojedynczego pliku"
 
-#: shell/e-shell-importer.c:1 shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25155,32 +25267,32 @@ msgstr ""
 "Poczekaj chwil�...\n"
 "Trwa analizowanie istniej�cej konfiguracji"
 
-#: shell/e-shell-importer.c:1 shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Uruchamianie inteligentnych importer�w"
 
-#: shell/e-shell-importer.c:1 shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Wybierz folder, do kt�rego powinny zosta� zaimportowane te dane"
 
-#: shell/e-shell-importer.c:1 shell/importer/intelligent.c:1
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:1
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Zamykanie po��cze�..."
 
-#: shell/e-shell-offline-sync.c:1
+#: shell/e-shell-offline-sync.c:161
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25189,47 +25301,47 @@ msgstr ""
 "B��d podczas synchronizacji \"%s\":\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:1
+#: shell/e-shell-offline-sync.c:239
 msgid "Syncing Folder"
 msgstr "Synchronizowanie folderu"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:1
+#: shell/e-shell-offline-sync.c:317
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:1
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Ustawienia Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:1
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 msgid "Opening Folder"
 msgstr "Otwieranie folderu"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:1
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Otwieranie folderu \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:1
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Otw�rz za pomoc� programu %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:1
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Nie mo�na zmieni� nazwy folderu: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:1
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
 "Nie mo�na utworzy� podanego folderu:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Assistant interface\n"
@@ -25238,105 +25350,105 @@ msgstr ""
 "Nie mo�na uruchomi� interfejsu druida pocztowego Evolution\n"
 "(%s)"
 
-#: shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-startup-wizard.c:169
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nie mo�na uruchomi� interfejsu druida pocztowego Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:1
-#: shell/e-shell-user-creatable-items-handler.c:1
-#: widgets/misc/e-charset-picker.c:1
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
+#: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nowy"
 
-#: shell/e-shell-utils.c:1
+#: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Nie podano nazwy folderu."
 
-#: shell/e-shell-utils.c:1
+#: shell/e-shell-utils.c:121
 msgid "Folder name cannot contain the Return character."
 msgstr "Nazwa folderu nie mo�e zawiera� znaku ko�ca wiersza."
 
-#: shell/e-shell-utils.c:1
+#: shell/e-shell-utils.c:127
 msgid "Folder name cannot contain slashes."
 msgstr "Nazwa folderu nie mo�e zawiera� uko�nik�w."
 
-#: shell/e-shell-utils.c:1
+#: shell/e-shell-utils.c:133
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" oraz \"..\" s� zarezerwowanymi nazwami folder�w."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nie znajduje si� w �cie�ce."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Nie mo�na uruchomi� Bug buddy."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Informacje o programie Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Przej�cie do innego folderu..."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Wybierz folder, kt�ry chcesz otworzy�"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Tworzy nowy skr�t"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Wybierz folder, na kt�ry ma wskazywa� skr�t:"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "Praca _z pod��czeniem"
 
-#: shell/e-shell-view-menu.c:1 ui/evolution.xml.h:1
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Praca _bez pod��czenia"
 
-#: shell/e-shell-view-menu.c:1 ui/evolution.xml.h:1
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Praca bez pod��czenia"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:226
 msgid "(No folder displayed)"
 msgstr "(Nie wy�wietlono folderu)"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(Brak)"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1896
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution dzia�a obecnie w trybie z pod��czeniem do sieci. Aby "
 "przej�� w tryb bez pod��czenia, kliknij ten przycisk."
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution przechodzi obecnie w tryb bez pod��czenia do sieci."
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution dzia�a obecnie w trybie bez pod��czenia do sieci. Aby "
 "przej�� w tryb z pod��czeniem, kliknij ten przycisk."
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25348,12 +25460,12 @@ msgstr ""
 "Opis b��du otrzymany od systemu aktywacji:\n"
 "%s"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo�na ustawi� lokalnego miejsca przechowywania -- %s"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25364,31 +25476,31 @@ msgstr ""
 "nieoczekiwanie zako�czy� dzia�anie. Aby ponownie uzyska� dost�p do\n"
 "danych, nale�y zako�czy� Evolution, a nast�pnie uruchomi� ponownie."
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Nie mo�na dokona� rejestracji na serwerze OAF"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
-#: shell/e-shell.c:1 shell/e-storage.c:1
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "B��d og�lny"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Tworzenie nowej grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25397,117 +25509,117 @@ msgstr ""
 "Czy na pewno chcesz usun�� z paska skr�t�w\n"
 "grup� \"%s\"?"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Nie usuwaj"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Zmiana nazwy grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Zmie� nazw� wybranej grupy skr�t�w na:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Ma�e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Wy�wietla skr�ty jako ma�e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Du�e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Wy�wietla skr�ty jako du�e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nowa grupa..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Tworzy now� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Usu� grup�..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Usuwa t� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Zmie� nazw� grupy..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Zmienia nazw� grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ukryj pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Ukrywa pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:274
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Tworzy nowy skr�t"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:275
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Tworzy nowy skr�t"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Zmiana nazwy skr�tu"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Zmie� nazw� wybranego skr�tu na:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Otwiera folder powi�zany ze skr�tem"
 
-#: shell/e-shortcuts-view.c:1 ui/evolution.xml.h:1
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Otw�rz w nowym _oknie"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Otwiera w nowym oknie folder powi�zany ze skr�tem"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Zmie� nazw�"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Zmienia nazw� skr�tu"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Usu�"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Usuwa skr�t z paska skr�t�w"
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "B��d przy zapisywaniu skr�t�w."
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Skr�ty"
 
@@ -25515,77 +25627,77 @@ msgstr "Skr�ty"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "bez b��du"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Folder o tej nazwie ju� istnieje"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Podany typ folderu nie jest poprawny"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "B��d We/Wy"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Brak miejsca na utworzenie folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Folder nie jest pusty"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Nie odnaleziono okre�lonego folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funkcja nie zosta�a zaimplementowana dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Podany typ nie jest obs�ugiwany dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nie mo�na zmodyfikowa� ani usun�� podanego folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nie mo�na ustawi� folderu jako potomka jednego z folder�w podrz�dnych"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Nie mo�na utworzy� folderu o tej nazwie"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:586
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-task-widget.c:1
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:1
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zako�czono %d%%)"
 
-#: shell/evolution-folder-selector-button.c:1
+#: shell/evolution-folder-selector-button.c:94
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybra� folder> "
 
-#: shell/evolution-shell-component-utils.c:1
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -25596,7 +25708,7 @@ msgstr ""
 "\n"
 "Nieznany b��d."
 
-#: shell/evolution-shell-component-utils.c:1
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -25609,7 +25721,7 @@ msgstr ""
 "Opis b��du otrzymany od systemu komponent�w:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:1
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -25622,67 +25734,67 @@ msgstr ""
 "Opis b��du otrzymany od systemu aktywacji:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1145
 msgid "CORBA error"
 msgstr "B��d Corby"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1147
 msgid "Interrupted"
 msgstr "Przerwane"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1149
 msgid "Invalid argument"
 msgstr "Niepoprawny argument"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1151
 msgid "Already has an owner"
 msgstr "Ma ju� w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1153
 msgid "No owner"
 msgstr "Brak w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1155
 msgid "Not found"
 msgstr "Nie odnaleziono"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1157
 msgid "Unsupported type"
 msgstr "Nieobs�ugiwany typ"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1159
 msgid "Unsupported schema"
 msgstr "Nieobs�ugiwany schemat"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1161
 msgid "Unsupported operation"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1163
 msgid "Internal error"
 msgstr "B��d wewn�trzny"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1167
 msgid "Exists"
 msgstr "Istnieje"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1169
 msgid "Invalid URI"
 msgstr "Niepoprawny URI"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1173
 msgid "Has subfolders"
 msgstr "Zawiera foldery podrz�dne"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1175
 msgid "No space left"
 msgstr "Brak miejsca"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1177
 msgid "Old owner has died"
 msgstr "Poprzedni w�a�ciciel zako�czy� dzia�anie"
 
-#: shell/evolution-test-component.c:1
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Typ pliku:"
@@ -25691,17 +25803,17 @@ msgstr "Typ pliku:"
 msgid "Active connections"
 msgstr "Aktywne po��czenia"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Kliknij OK, aby zamkn�� powy�sze po��czenia i przej�� w tryb bez pod��czenia "
 "do sieci"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Host"
 msgstr "Komputer"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/glade/e-active-connection-dialog.glade.h:4
 msgid "The following connections are currently active:"
 msgstr "Obecnie aktywne s� nast�puj�ce po��czenia:"
 
@@ -25709,15 +25821,15 @@ msgstr "Obecnie aktywne s� nast�puj�ce po��czenia:"
 msgid "C_alendar:"
 msgstr "K_alendarz:"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
+#: shell/glade/e-shell-config-default-folders.glade.h:2
 msgid "_Contacts:"
 msgstr "_Kontakty:"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
+#: shell/glade/e-shell-config-default-folders.glade.h:3
 msgid "_Mail:"
 msgstr "_Poczta:"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
+#: shell/glade/e-shell-config-default-folders.glade.h:4
 msgid "_Tasks:"
 msgstr "_Zadania:"
 
@@ -25725,11 +25837,11 @@ msgstr "_Zadania:"
 msgid "Folder name:"
 msgstr "Nazwa folderu:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Typ folderu:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Specify where to create the folder:"
 msgstr "Okre�l miejsce utworzenia folderu:"
 
@@ -25738,35 +25850,35 @@ msgstr "Okre�l miejsce utworzenia folderu:"
 msgid "Open Other User's Folder"
 msgstr "Utw�rz _nowy folder..."
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
 msgid "_Folder Name:"
 msgstr "Nazwa f_olderu:"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
 msgid "_User:"
 msgstr "Nazwa _u�ytkownika:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Druid ustawie� Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Importing Files"
 msgstr "Importowanie plik�w"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:8
 msgid "Timezone "
 msgstr "Strefa czasowa"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:9
 msgid "Welcome"
 msgstr "Witaj"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:10
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
@@ -25780,10 +25892,11 @@ msgstr ""
 "\n"
 "Aby kontynuowa�, kliknij \"Naprz�d\"."
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: 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 ""
@@ -25798,31 +25911,27 @@ msgstr ""
 "Kliknij \"Zaimportuj\" aby rozpocz��\n"
 "import pliku do Evolution."
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Druid importu Evolution"
 
-#: shell/importer/import.glade.h:1
-msgid "Evolution Importer Assistant"
-msgstr "Druid importu Evolution"
-
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:3
 msgid "Import File (step 3 of 3)"
 msgstr "Import pliku (krok 3 z 3)"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Typ importera (krok 1 z 3)"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Wyb�r importer�w (krok 2 z 3)"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Wyb�r pliku (krok 2 z 3)"
 
-#: shell/importer/import.glade.h:1
+#: 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"
@@ -25832,31 +25941,31 @@ msgstr ""
 "Druid ten przeprowadzi ci� przez proces importu do\n"
 "Evolution zewn�trznych plik�w w wybranym formacie."
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importery"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Nie importuj"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Nie pytaj o to ponownie"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Mo�na zaimportowa� do Evolution dane z nast�puj�cych plik�w:"
 
-#: shell/main.c:1
+#: shell/main.c:96
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:1
+#: shell/main.c:102
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ko�czy prac�..."
 
-#: shell/main.c:1
+#: shell/main.c:227
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25876,7 +25985,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:1
+#: shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -25884,352 +25993,352 @@ msgstr ""
 "Dzi�kujemy\n"
 "Zesp� Ximian Evolution\n"
 
-#: shell/main.c:1
+#: shell/main.c:259
 msgid "Don't tell me again"
 msgstr "Bez wy�wietlania tego ponownie"
 
-#: shell/main.c:1
+#: shell/main.c:394
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie mo�na uzyska� dost�pu do pow�oki Ximian Evolution."
 
-#: shell/main.c:1
+#: shell/main.c:403
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie mo�na zainicjowa� pow�oki Ximian Evolution: %s"
 
-#: shell/main.c:1
+#: shell/main.c:485
 msgid "Disable splash screen"
 msgstr "Ukrywa okno powitalne"
 
-#: shell/main.c:1
+#: shell/main.c:487
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Rozpoczynanie importowania"
 
-#: shell/main.c:1
+#: shell/main.c:489
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Uruchamianie inteligentnych importer�w"
 
-#: shell/main.c:1
+#: shell/main.c:491
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Zapisuje do pliku informacje dotycz�ce przebiegu wykonania komponent�w."
 
-#: shell/main.c:1
+#: shell/main.c:493
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:1
+#: shell/main.c:511
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:1
+#: shell/main.c:542
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo�na zainicjowa� systemu komponent�w Bonobo."
 
-#: tools/evolution-addressbook-abuse.c:1
-#: tools/evolution-addressbook-export.c:1
-#: tools/evolution-addressbook-import.c:1
+#: tools/evolution-addressbook-abuse.c:80
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "B��d przy odczycie domy�lnej ksi��ki adresowej."
 
-#: tools/evolution-addressbook-abuse.c:1
-#: tools/evolution-addressbook-import.c:1
+#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Plik wej�ciowy"
 
-#: tools/evolution-addressbook-export.c:1
+#: tools/evolution-addressbook-export.c:46
 msgid "Output File"
 msgstr "Plik wy�ciowy"
 
-#: tools/evolution-addressbook-import.c:1
+#: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr "Nie podano nazwy pliku."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopiuje kontakty do innego folderu..."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopiuje zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Skopiuj do folderu..."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Wycina zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Usuwa zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Przenosi kontakty do innego folderu..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Przenie� do folderu..."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Wkleja zawarto�� schowka"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Wy�wietla podgl�d kontakt�w w postaci przygotowanej do druku"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Podgl�d wyd_ruku"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Drukuje zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Zapisuje zaznaczone kontakty w formacie VCard."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Zaznacza wszystkie kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Wysy�a list do wybranych kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Wy�lij list do kontaktu"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Wysy�a zaznaczone kontakty do innej osoby."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Zatrzymuje wczytywanie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Wy�wietla bie��cy kontakt"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-mail-global.xml.h:1
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution-task-editor.xml.h:1
-#: ui/evolution-tasks.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "C_zynno�ci"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Prze�lij kontakt..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "Z_apisz w formacie VCard"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Szukaj kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Z_aznacz wszystko"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Wy�lij _list do kontaktu..."
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Dzie�"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Usuwa termin"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Przejd� do"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Wstecz"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Naprz�d"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Przejd� do _daty"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Przechodzi do podanej daty"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Przechodzi do dzisiaj"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Miesi�c"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Wy�wietla podgl�d kalendarza w postaci przygotowanej do druku"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Drukuje zawarto�� kalendarza"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Poblikuje informacj� o zaj�to�ci na podstawie tego kalendarza"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Wy�wietla jeden dzie�"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Wy�wietla jeden miesi�c"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Wy�wietla jeden tydzie�"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Wy�wietla tydzie� roboczy"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Tydzie�"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:3
 msgid "Close this item"
 msgstr "Zamyka bie��cy element"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Usuwa bie��cy element"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "G��wny pasek narz�dziowy"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:7
 msgid "Preview the printed item"
 msgstr "Wy�wietla podgl�d elementu w postaci przygotowanej do druku"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Drukuje bie��cy element"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 widgets/misc/e-filter-bar.c:1
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Zapisz"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:13
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Zapisz i zamknij"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Zapisuje element i zamyka okno dialogowe"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Zapisuje bie��cy element na dysku"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Plik"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Wydrukuj _kopert�..."
 
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Zapisz j_ako..."
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Zapisuje kontakt i zamyka okno dialogowe"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "Wy�lij _list do kontaktu..."
 
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Usuwa t� list�"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete..."
 msgstr "Usu�..."
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Zapisuje list� i zamyka okno dialogowe"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "_Wy�lij list� do innej osoby..."
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Wy�lij _list do listy..."
 
@@ -26237,218 +26346,220 @@ msgstr "Wy�lij _list do listy..."
 msgid "Cancel Mee_ting"
 msgstr "_Anuluj spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "Anuluje spotkanie zwi�zane z tym elementem"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Prze�lij w formacie i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Przesy�a ten element w li�cie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Pobiera naj�wie�sze informacje o spotkaniu"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "_Od�wie� spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "_Zaplanuj spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Planuje spotkanie zwi�zane z tym elementem"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Dopasuj Moje Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Anuluje bie��c� operacj� na listach"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
 msgstr "Utw�rz _nowy list"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
 msgstr "Pozwala na utworzenie lub modyfikacj� regu� filtrowania list�w"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Pozwala na utworzenie lub modyfikacj� definicji wirtualnych folder�w"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Opr�nij �mie_tnik"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Zapomnij _has�a"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zapomina zapami�tane has�a, co spowoduje ponowne pytanie o nie"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Otwiera okno umo�liwiaj�ce napisanie nowego listu"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trwale usuwa listy oznaczone do usuni�cia ze wszystkich folder�w"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:11
 #, fuzzy
 msgid "Post New Message"
 msgstr "Nowy list"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Post a message to a Public folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Su_bskrybcje folder�w..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Wy�wietla podgl�d listu w wydzielonej cz�ci okna"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Pozwala za zasubskrybowanie lub odsubskrybowanie folder�w na zdalnych "
 "serwerach"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Edytor wirtualnych folder�w..."
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtry..."
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_Podgl�d listu"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "_Subscribe to Folders..."
-msgstr "Su_bskrybcje folder�w..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Zmienia w�a�ciwo�ci folderu"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Kopiuje zaznaczone listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Wytnij"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Wycina zaznaczone listy do schowka"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Ukrycie _zaznaczonych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Ukrycie _usuni�tych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Ukrywanie prz_eczytanych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Ukrywa listy oznaczone do usuni�cia, zamiast wy�wietlania ich z "
 "przekre�leniem"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Oznacz wszystkie jako p_rzeczytane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Oznacza wszystkie widoczne listy jako przeczytane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Wkleja list ze schowka"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trwale usuwa listy oznaczone do usuni�cia z bie��cego folderu"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Zaznacz w_szystkie"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Zaznacz w�_tek"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Zaznacza wszystkie listy (i tylko te), kt�re obecnie nie s� zaznaczone"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Zaznacza wszystkie listy w bie��cym w�tku"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Zaznacza wszystkie widoczne listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "Wy�wietlanie uk_rytych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Wy�wietla listy, kt�re by�y czasowo ukryte"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Czasowo ukrywa listy, kt�re zosta�y przeczytane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Czasowo ukrywa zaznaczone listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Prze��cza grupowanie list�w w w�tki"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-tasks.xml.h:1
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "Wy_czy��"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Folder"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Odwr�� zaznaczenie"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_W�a�ciwo�ci..."
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "Grupowanie list�w w w�t_ki"
 
@@ -26457,436 +26568,437 @@ msgstr "Grupowanie list�w w w�t_ki"
 msgid "A_dd Sender to Addressbook"
 msgstr "Dodaj nadawc� do ksi��ki adresowej"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:2
 #, fuzzy
 msgid "A_pply Filters"
 msgstr "Zastosuj filtry"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:3
 #, fuzzy
 msgid "Add Sender to Addressbook"
 msgstr "Dodaj nadawc� do ksi��ki adresowej"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Zastosowuje regu�y filtru w odniesieniu do zaznaczonych list�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Odpowiada wszystkim odbiorcom zaznaczonego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Odpowiada na list� dyskusyjn� zwi�zan� z zaznaczonym listem"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Odpowiada nadawcy zaznaczonego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopiuje zaznaczone listy do innego folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Utw�rz _wirtualny folder na podstawie listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Tworzy regu��, filtruj�c� listy od tego nadawcy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Tworzy regu��, filtruj�c� listy do tych odbiorc�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Tworzy regu��, filtruj�c� listy z tej listy dyskusyjnej"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Tworzy regu��, filtruj�c� listy o tym temacie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Tworzy wirtualny folder dla tych odbiorc�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Tworzy wirtualny folder dla tej listy dyskusyjnej"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Tworzy wirtualny folder dla tego nadawcy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Tworzy wirtualny folder dla tego tematu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Zmniejsza rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Wy�wietla kolejny wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Wy�wietla kolejny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Wy�wietla kolejny nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Wy�wietla kolejny nieprzeczytany w�tek"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Wy�wietla poprzedni wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Wy�wietla poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Wy�wietla poprzedni nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "F_orward"
 msgstr "Prze�lij"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtr w oparciu o li_st� dyskusyjn�..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtr w oparciu o n_adawc�..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtr w oparciu o o_dbiorc�w..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtr w oparciu o t_emat..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Oznacza zaznaczone listy do usuni�cie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Follow _Up..."
 msgstr "Pe�na _nazwa..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Wymusza pobranie obraz�w pojawiaj�cych si� w HTML-u"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Przesy�a zaznaczony list do innej osoby w tre�ci nowego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Przesy�a zaznaczony list do innej osoby zacytowany jak przy odpowiedzi"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Przesy�a zaznaczony list do innej osoby"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Przesy�a zaznaczony list do innej osoby w postaci za��cznika"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Zwi�ksza rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Pobierz _obrazy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Oz_nacz jako wa�ne"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Ozn_acz jako niewa�ne"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Oznacza zaznaczone listy jako przeczytane"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Oznacza zaznaczone listy jako wa�ne"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Oznacza zaznaczone listy jako nieprzeczytane"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Oznacza zaznaczone listy jako niewa�ne"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Oznacza zaznaczone listy do usuni�cie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Przenie�"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Przenosi zaznaczone listy do nowego folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Nast�pny"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Kolejny wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Kolejny w�tek"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Kolejny nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Otwiera zaznaczony list w nowym oknie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Otwiera zaznaczony list w oknie redagowania umo�liwiaj�c jego ponowne "
 "wys�anie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "_Pierwotny rozmiar"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Poprzedni nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Post a Reply"
 msgstr "Odpowied� na zadanie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Post a reply to a message message in a Public folder"
 msgstr "Sprawdzanie nowych list�w we wszystkich folderach"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Poprzedni wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Wy�wietla podgl�d listu w postaci przygotowanej do druku"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Drukuje list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Przesy�a zaznaczony list do innej osoby"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Przywraca pierwotny rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "_Przeszukaj list..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Mniejszy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Zapisuje list w pliku tekstowym"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Wyszukuje tekst w tre�ci wy�wietlanego listu"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Ustala ustawienia strony bie��cej drukarki"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Wy�wietlanie postaci �_r�d�owej listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Wy�wietlanie wszystkich _nag��wk�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Wy�wietla list w zwyk�y spos�b"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Wy�wietla list wraz ze wszystkimi nag��wkami"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Wy�wietla list w surowej, �r�d�owej postaci"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Cofa oznaczenie do usuni�cia dla wszystkich zaznaczonych list�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder w oparciu o _list� dyskusyjn�..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "VFolder w oparciu o _nadawc�..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "VFolder w oparciu o _odbiorc�w..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "VFolder w oparciu o _temat..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Za��cz"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Utw�rz filtr na podstawie listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Prze�lij list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Przejd� do"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Tre�� listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Wi�kszy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Wy�wietlanie lis_tu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "P_rzenie� do folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "_Kolejny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Zwyk�e wy�wietlanie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Otw�rz list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "_Poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Jako cytat"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Zmie� nazw�..."
 
-#: ui/evolution-mail-message.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "_Narz�dzia"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Cofnij usuni�cie"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Zamyka bie��ce okno"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "Zam_knij"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "_Widok"
 
@@ -26894,176 +27006,176 @@ msgstr "_Widok"
 msgid "Attach"
 msgstr "Za��cz"
 
-#: ui/evolution-message-composer.xml.h:1 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Zamyka bie��cy plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Czy�ci wszystko za wyj�tkiem podpisu"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Szyfruje list przy u�yciu PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Szyfruje list za pomoc� cerftyfikatu szyfruj�cego S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "_Format"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "HT_ML"
 msgstr "_HTML"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Otw�rz"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Szyfrowanie S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Zapisz jako"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Zapisz _szkic"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Zapisz w folderze..."
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Zapisuje bie��cy plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Zapisuje bie��cy plik pod inn� nazw�"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Zapisuje list w podanym folderze"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Wy�lij"
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Okre�la, czy list powinien zosta� wys�any w formacie HTML"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Send this message"
 msgstr "Wysy�a list natychmiast"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Wy�wietla / ukrywa za��czniki"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Wy�wietlanie _za��cznik�w"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Prze��cza wy�wietlanie za��cznik�w"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Podpisuje list za pomoc� klucza PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpisuje list za pomoc� certyfikatu podpisuj�cego S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Prze��cza wy�wietlanie pola BCC"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Prze��cza wy�wietlanie pola CC"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Prze��cza wy�wietlanie listy wyboru w polu Od"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Prze��cza wy�wietlanie pola Odpowied� do (Reply-To)"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Za��cznik..."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Pole _Bcc"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Pole _Cc"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Usu� wszystko"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "W_staw"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Otw�rz..."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Pole Odpowied� _do"
 
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Save the current file and close the window"
 msgstr "Zapisuje bie��cy plik i zamyka okno"
 
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:16
 #, fuzzy
 msgid "_Signature editor"
 msgstr "Plik z p_odpisem:"
@@ -27072,23 +27184,23 @@ msgstr "Plik z p_odpisem:"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaje folder do listy zasubskrybowanych folder�w"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Folder"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Od�wie�a list� folder�w"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Usuwa folder z listy zasubskrybowanych folder�w"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Zapisz"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Wypisz"
 
@@ -27096,58 +27208,58 @@ msgstr "Wypisz"
 msgid "Assign Task"
 msgstr "Przypisz zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:2
 msgid "Assign this task to others"
 msgstr "Przypisuje zadanie innej osobie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Anuluj zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:4
 msgid "Cancel this task"
 msgstr "Anuluje zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:7
 msgid "Obtain the latest task information"
 msgstr "Pobiera naj�wie�sze informacje o spotkaniu"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "_Od�wie� zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiuje zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Wycina zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:6
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Usuwa zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Usuwa zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "_Oznacz jako zako�czone"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Wkleja zadanie ze schowka"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:11
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Wy�wietla podgl�d kontakt�w w postaci przygotowanej do druku"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "Drukuje list"
@@ -27156,212 +27268,233 @@ msgstr "Drukuje list"
 msgid "About Ximian Evolution..."
 msgstr "Informacje o programie Ximian Evolution..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:2
 msgid "Add to _Shortcut Bar"
 msgstr "Dodaj do paska _skr�t�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:3
 msgid "Change Evolution's settings"
 msgstr "Zmienia ustawienia Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Zmienia nazw� folderu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopiuje folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Utw�rz _nowy folder..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Tworzy na pasku skr�t�w odno�nik do bie��cego folderu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Tworzy nowy folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:11
 msgid "Create a new shortcut"
 msgstr "Tworzy nowy skr�t"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:12
 msgid "Create a new window displaying this folder"
 msgstr "Otwiera ten folder w nowym oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Usuwa folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Wy�wietla inny folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Zako�cz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Okno Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Ko�czy prac� programu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Import danych z innych program�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Przenosi folder w inne miejsce"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Utw�rz _nowy folder..."
 
-#: ui/evolution.xml.h:1
-msgid "Open a folder that is made available by some other user on the server"
+#: ui/evolution.xml.h:22
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Otw�rz w nowym oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Otwiera folder w nowym oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Pi_lot Settings..."
 msgstr "_Ustawienia pilota..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Ustawienia pilota..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Utw�rz _nowy folder..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Wy�lij / Odbierz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Wysy�a listy w kolejce i pobiera nowe"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Konfiguracja poczty"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Konfiguracja poczty"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Wy�wietla informacje o programie Ximian Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Wy�lij zg�oszenie b��du"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Wy�lij zg�oszenie _b��du"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Wysy�a zg�oszenie b��du za pomoc� Bug Buddy"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Prze��cz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Prze��cza wy�wietlanie paska folder�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prze��cza wy�wietlanie paska skr�t�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr ""
 "Prze��cza pomi�dzy trybami pracy z pod��czeniem i bez pod��czenia do sieci."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Wy�wietla zaznaczony folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "_Najcz�ciej zadawane pytania"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "_Informacje o programie Ximian Evolution..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "Pasek f_older�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:52
 msgid "_Folder..."
 msgstr "_Folder..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Przejd� do folderu..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "Za_importuj..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Przenie�..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nowy"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Nowy folder"
 
-#: ui/evolution.xml.h:1
-msgid "_Preferences..."
-msgstr "P_referencje"
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Remove Other User's Folder"
+msgstr "Utw�rz _nowy folder..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Zmie� nazw�..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "Wy�lij / _Odbierz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Ustawienia"
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Pasek _skr�t�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:64
 msgid "_Shortcut..."
 msgstr "_Skr�t..."
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Wydrukuj zestawienie"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Od�wie�"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Od�wie�a widok"
 
@@ -27369,11 +27502,11 @@ msgstr "Od�wie�a widok"
 msgid "By _Company"
 msgstr "Wed�ug f_irmy"
 
-#: views/addressbook/galview.xml.h:1
+#: views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "Karty _adresowe"
 
-#: views/addressbook/galview.xml.h:1
+#: views/addressbook/galview.xml.h:3
 msgid "_Phone List"
 msgstr "Lista _telefon�w"
 
@@ -27381,15 +27514,15 @@ msgstr "Lista _telefon�w"
 msgid "W_eek View"
 msgstr "Widok _tygodnia"
 
-#: views/calendar/galview.xml.h:1
+#: views/calendar/galview.xml.h:2
 msgid "_Day View"
 msgstr "Widok _dnia"
 
-#: views/calendar/galview.xml.h:1
+#: views/calendar/galview.xml.h:3
 msgid "_Month View"
 msgstr "Widok _miesi�ca"
 
-#: views/calendar/galview.xml.h:1
+#: views/calendar/galview.xml.h:4
 msgid "_Work Week View"
 msgstr "Widok tygodnia _roboczego"
 
@@ -27398,23 +27531,23 @@ msgstr "Widok tygodnia _roboczego"
 msgid "As Sent Folder"
 msgstr "Wyb�r folderu"
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:2
 msgid "By Follow Up Flag"
 msgstr ""
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Wed�ug nadawcy"
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Wed�ug stanu"
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Wed�ug tematu"
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Listy"
 
@@ -27423,13 +27556,13 @@ msgstr "Listy"
 msgid "With _Category"
 msgstr "Wraz z kategoriami"
 
-#: views/tasks/galview.xml.h:1
+#: views/tasks/galview.xml.h:2
 msgid "_Tasks"
 msgstr "_Zadania"
 
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:1
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27437,15 +27570,15 @@ msgstr "UTC"
 msgid "Select a Time Zone"
 msgstr "Wyb�r strefy czasowej"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "Selection:"
 msgstr "Wyb�r:"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "Time Zones"
 msgstr "Strefy czasowe"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -27455,190 +27588,190 @@ msgstr ""
 "stref� czasow�.\n"
 "Przyci�ni�cie prawego przycisku przywraca zwyk�e powi�kszenie."
 
-#: widgets/menus/gal-view-menus.c:1
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Bie��cy widok"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:1
+#: widgets/menus/gal-view-menus.c:357
 msgid "Custom View"
 msgstr "Dowolny widok"
 
-#: widgets/menus/gal-view-menus.c:1
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:1
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Zdefiniuj widoki"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:1
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "PW�CPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:1 widgets/misc/e-dateedit.c:1
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Teraz"
 
-#: widgets/misc/e-cell-date-edit.c:1 widgets/misc/e-dateedit.c:1
+#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Dzi�"
 
-#: widgets/misc/e-cell-date-edit.c:1
+#: widgets/misc/e-cell-date-edit.c:797
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Czas musi by� podany w formacie: %s"
 
-#: widgets/misc/e-cell-percent.c:1
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Warto�� procentowa musi si� zawiera� w przedziale od 0 do 100 w��cznie"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Ba�tycki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "�rodkowoeuropejski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Chi�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Grecki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:64
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:65
 msgid "Japanese"
 msgstr "Japo�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Korea�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turecki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Zachodnioeuropejski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Tradycyjny"
 
-#: widgets/misc/e-charset-picker.c:1 widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
 msgid "Simplified"
 msgstr "Uproszczony"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ukrai�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:95
 #, fuzzy
 msgid "Visual"
 msgstr "Unieaktywnij"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nieznany zestaw znak�w: %s"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Podaj wykorzystywany zestaw znak�w"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Inny..."
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Standard kodowania znak�w"
 
-#: widgets/misc/e-clipped-label.c:1
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:1
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Edytor wyszukiwa�"
 
-#: widgets/misc/e-filter-bar.c:1
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Zapisz wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.h:1 widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 msgid "_Save Search..."
 msgstr "_Zapisz wyszukiwanie..."
 
-#: widgets/misc/e-filter-bar.h:1 widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Dodaj do zapisanych wyszukiwa�"
 
-#: widgets/misc/e-filter-bar.h:1 widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
 msgid "_Advanced..."
 msgstr "_Zaawansowane..."
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informacje"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "B��d"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Pytanie"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "List"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "Bez wy�wietlania tego komunikatu w przysz�o�ci."
 
-#: widgets/misc/e-search-bar.c:1
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Find Now"
 msgstr "Znajd�"
 
-#: widgets/misc/e-search-bar.c:1
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Clear"
 msgstr "Wyczy��"
 
-#: widgets/misc/e-search-bar.c:1
+#: widgets/misc/e-search-bar.c:894
 msgid "Clear"
 msgstr "Wyczy��"
 
-#: widgets/misc/e-search-bar.c:1
+#: widgets/misc/e-search-bar.c:896
 msgid "Find Now"
 msgstr "Znajd�"
 
@@ -27647,23 +27780,57 @@ msgstr "Znajd�"
 msgid "The Personal Addressbook Server"
 msgstr "Osobisty serwer ksi��ki adresowej"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Osobisty serwer ksi��ki adresowej; generator kalendarza"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nie mo�na zainicjowa� GNOME-VFS"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nie mo�na zainicjowa� GNOME"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 
+#~ msgid "Scanning for new messages"
+#~ msgstr "Wyszukiwanie nowych list�w"
+
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Folder o nazwie %s ju� nie istnieje"
+
+#~ msgid "1 byte"
+#~ msgstr "1 bajt"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u bajt�w"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Nie zosta� wybrany folder.\n"
+#~ "Wr�� i podaj folder, do kt�rego powinna by� dostarczona poczta."
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importowanie %s\n"
+#~ "Importer nie jest gotowy.\n"
+#~ "Oczekiwanie przez 5 sekund przed ponowieniem."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Druid importu Evolution"
+
+#~ msgid "_Preferences..."
+#~ msgstr "P_referencje"
+
 #~ msgid "Error in search expression."
 #~ msgstr "B��d w wyra�eniu wyszukiwania."
 
@@ -27691,9 +27858,8 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ "occurred.  Thank you."
 #~ msgstr ""
 #~ "Nie mo�na uzyska� lokalnego miejsca przechowywania ksi��ki adresowej.\n"
-#~ "Mo�e to by� spowodowane nieprawid�owym dzia�aniem "
-#~ "komponentuevolution-addressbook. Aby pom�c nam w zrozumieniu i "
-#~ "rozwi�zaniu tego\n"
+#~ "Mo�e to by� spowodowane nieprawid�owym dzia�aniem komponentuevolution-"
+#~ "addressbook. Aby pom�c nam w zrozumieniu i rozwi�zaniu tego\n"
 #~ "problemu, wy�lij e-mail (w j�zyku angielskim) do Jona Trowbridge'a\n"
 #~ "<trow@ximian.com>, szczeg�owo opisuj�c warunki, w jakich pojawi� si�\n"
 #~ "problem. Dzi�kujemy."
diff --git a/po/pt.po b/po/pt.po
index fa0109b7a1..0fbfa2087e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.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: 2000-04-16 16:33+01:00\n"
 "Last-Translator: Tiago Ant�o <tiagoantao@bigfoot.com>\n"
 "Language-Team: Gnome Portuguese <gnome@poli.org>\n"
@@ -338,11 +338,17 @@ msgstr "Nome completo:"
 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 "_Novo Contacto"
+
+#: 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 ""
@@ -353,49 +359,49 @@ 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 "N�o se consegui 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
 #, fuzzy
 msgid "Searching..."
 msgstr "Ano"
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 #, fuzzy
 msgid "Loading..."
 msgstr "Imprimir calend�rio"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Criar um novo calend�rio"
 
-#: 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 "Erro a gravar os atalhos."
@@ -414,13 +420,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
 #, fuzzy
 msgid "Could not start wombat"
@@ -494,10 +500,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Pressione aqui para o livro de endere�os"
 
 #: 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"
@@ -518,32 +524,42 @@ msgstr "Servidor:"
 msgid "LDAP server containing contact information"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Uma pasta contendo entradas de calend�rio"
+
+#: addressbook/gui/component/addressbook-component.c:567
 #, fuzzy
 msgid "New Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 #, fuzzy
 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 "Criar um novo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "New Contact List"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "A sua lista de contactos"
@@ -584,7 +600,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 "N�o se consegui inicializar Bonobo"
@@ -594,24 +610,24 @@ msgstr "N�o se consegui inicializar Bonobo"
 msgid "Other Contacts"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: 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"
@@ -619,47 +635,57 @@ 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 "Criar um novo calend�rio"
+
+#: 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
 #, fuzzy
 msgid "Email begins with"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "�cone_s pequenos"
 
 #. 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 "Uma pasta contendo tarefas"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 #, fuzzy
 msgid "Advanced..."
 msgstr "Adicionar..."
 
-#: 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"
@@ -667,7 +693,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"
@@ -675,25 +701,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 "O URI que o navegador de pastas mostrar�"
 
@@ -764,50 +790,50 @@ msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "_Op��es"
+msgid "1234"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "Remover"
+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"
-msgstr ""
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Remover"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
-msgstr ""
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "_Op��es"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
@@ -948,51 +974,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 "Apagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Apagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Ano"
 
 #. 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 "Ano"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Reponder para todos"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Apagar"
 
-#: 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"
@@ -1003,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"
@@ -1012,48 +1044,48 @@ 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 "Nenhuma Informa��o"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Abrir ficheiro"
 
-#: 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
 #, fuzzy
 msgid "Sub"
 msgstr "Do"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "_Nova pasta"
 
-#: 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"
@@ -1061,7 +1093,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"
@@ -1070,7 +1102,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"
@@ -1078,7 +1110,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"
@@ -1088,7 +1120,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"
@@ -1098,34 +1130,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"
@@ -1133,11 +1165,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"
@@ -1146,25 +1178,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 "Endere�o de correio:"
 
-#: 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
@@ -1173,49 +1205,49 @@ msgstr ""
 msgid "_Add"
 msgstr "Adicionar"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "Adicionar"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "_Ac��es"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "_Ac��es"
 
-#: 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 "Apagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "Dia"
 
-#: 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
@@ -1226,102 +1258,102 @@ msgstr ""
 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 Compromisso"
 
-#: 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 "_Op��es"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "Prioridade:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Apagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "Ano"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Server name:"
 msgstr "Encontrar mensagens"
 
-#: 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 "�cone_s pequenos"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "_Come�ando"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Abrir ficheiro"
 
-#: 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
 #, fuzzy
 msgid "searching-tab"
 msgstr "Ano"
@@ -1336,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"
@@ -1373,11 +1405,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "_Novo Contacto"
 
-#: 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 "Encontrar um contacto"
@@ -1459,7 +1491,7 @@ msgid "D_epartment:"
 msgstr "Data"
 
 #: 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 ""
 
@@ -1522,13 +1554,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
 #, fuzzy
 msgid "_Delete"
 msgstr "Apagar"
@@ -1559,1087 +1591,1087 @@ msgstr "Novo Ca_lend�rio"
 msgid "_Web page address:"
 msgstr "Endere�o de correio:"
 
-#: 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 "Encontrar mensagens"
 
-#: 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 "Organiza��o"
 
-#: 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
 #, fuzzy
 msgid "Belarus"
 msgstr "Ano"
 
-#: 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 "Tamanho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 #, fuzzy
 msgid "Benin"
 msgstr "Enviar"
 
-#: 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 "_Correio"
 
-#: 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
 #, fuzzy
 msgid "Canada"
 msgstr "Novo Ca_lend�rio"
 
-#: 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 "Carro"
 
-#: 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 "_Pasta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 #, fuzzy
 msgid "China"
 msgstr "Carro"
 
-#: 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 "Cores"
 
-#: 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 "Copiar"
 
-#: 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
 #, fuzzy
 msgid "Finland"
 msgstr "Encontrar"
 
-#: 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
 #, fuzzy
 msgid "Germany"
 msgstr "Dia"
 
-#: 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 "Semana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #, fuzzy
 msgid "Greenland"
 msgstr "Encontrar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #, fuzzy
 msgid "Grenada"
 msgstr "Novo Ca_lend�rio"
 
-#: 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
 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
 #, fuzzy
 msgid "Haiti"
 msgstr "_Correio"
 
-#: 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 "Horas"
 
-#: 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 "Domingo"
 
-#: 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 "Hoje"
 
-#: 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
 #, fuzzy
 msgid "Liberia"
 msgstr "_Correio"
 
-#: 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
 #, fuzzy
 msgid "Macau"
 msgstr "Ano"
 
-#: 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 "_Correio"
 
-#: 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 "_Correio"
 
-#: 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 "_Correio"
 
-#: 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
 #, fuzzy
 msgid "Mauritius"
 msgstr "�cones _grandes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #, fuzzy
 msgid "Mayotte"
 msgstr "Segunda-feira"
 
-#: 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 "Segunda-feira"
 
-#: 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 "Telem�vel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 #, fuzzy
 msgid "Myanmar"
 msgstr "Bip"
 
-#: 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 "Responder"
 
-#: 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 "Reponder para todos"
 
-#: 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 "_Contacto"
 
-#: 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 "Cabe�alhos:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 #, fuzzy
 msgid "Nigeria"
 msgstr "_Correio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 #, fuzzy
 msgid "Niue"
 msgstr "Minuto"
 
-#: 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 "Novo"
 
-#: 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 "Colar"
 
-#: 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 "Novo Ca_lend�rio"
 
-#: 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 "Bip"
 
-#: 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 "Encontrar"
 
-#: 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 "Prioridade"
 
-#: 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 "Data"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 #, fuzzy
 msgid "Reunion"
 msgstr "Segundos"
 
-#: 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 "Novo Ca_lend�rio"
 
-#: 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 "Fontes"
 
-#: 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 "Enviar"
 
-#: 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
 #, fuzzy
 msgid "Somalia"
 msgstr "F_ormato"
 
-#: 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 "Enviar"
 
-#: 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 "Dom"
 
-#: 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 "Nome"
 
-#: 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 "Encontrar"
 
-#: 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 "Enviar"
 
-#: 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
 #, fuzzy
 msgid "Tajikistan"
 msgstr "Lista de tarefas"
 
-#: 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 "Encontrar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 #, fuzzy
 msgid "Togo"
 msgstr "Para:"
 
-#: 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 "Hoje"
 
-#: 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 "Ter"
 
-#: 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
 #, fuzzy
 msgid "Uganda"
 msgstr "Novo Ca_lend�rio"
 
-#: 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 "_Items seleccionados"
 
-#: 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 "Enviar"
 
-#: 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 ""
 
@@ -2677,22 +2709,22 @@ msgstr ""
 msgid "Could not find widget for a field: `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: 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 "_Pastas"
 
-#: 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 "Nome completo:"
 
-#: 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 "Correio electr�nico 2"
@@ -2714,6 +2746,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
 #, fuzzy
 msgid "Address _2:"
@@ -2855,7 +2899,7 @@ msgstr "_Contacto"
 msgid "Contact List Editor"
 msgstr "_Contacto"
 
-#: 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 "Gravar como VCard"
@@ -2906,7 +2950,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 "Adicionar..."
@@ -2917,27 +2961,27 @@ msgstr "Adicionar..."
 msgid "Search"
 msgstr "Ano"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 #, fuzzy
 msgid "No cards"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 #, fuzzy
 msgid "1 card"
 msgstr "Imprimir calend�rio"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " segundos"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Erro a gravar os atalhos."
 
-#: 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"
@@ -2950,10 +2994,10 @@ msgid "Success"
 msgstr "Fontes"
 
 #: 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 ""
 
@@ -2961,7 +3005,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 ""
@@ -2983,8 +3027,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 ""
 
@@ -3039,7 +3083,7 @@ msgstr "Erro a gravar os atalhos."
 
 #: 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 "Erro a gravar os atalhos."
@@ -3057,9 +3101,8 @@ msgstr "Dia"
 #: 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
@@ -3159,7 +3202,7 @@ msgstr "Imposs�vel abrir o livro de endere�os"
 
 #: 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 "Gravar como VCard"
@@ -3248,7 +3291,7 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Colar"
 
-#: 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
@@ -3256,8 +3299,8 @@ msgstr "Colar"
 msgid "Delete"
 msgstr "Apagar"
 
-#: 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 "Ano corrente (%Y)"
@@ -3266,7 +3309,7 @@ msgstr "Ano corrente (%Y)"
 #. 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 ""
 
@@ -3274,11 +3317,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"
@@ -3417,7 +3460,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 ""
 
@@ -3444,7 +3487,7 @@ msgid "Options"
 msgstr "_Op��es"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 #, fuzzy
 msgid "Orientation"
 msgstr "Organiza��o"
@@ -3472,7 +3515,7 @@ msgstr "Fontes de correio"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 #, fuzzy
 msgid "Portrait"
 msgstr "Prioridade"
@@ -3546,7 +3589,7 @@ msgstr "_Editar Compromisso"
 
 #: 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
 #, fuzzy
 msgid "High"
 msgstr "Cabe�alhos:"
@@ -3554,14 +3597,14 @@ msgstr "Cabe�alhos:"
 #: 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
 #, fuzzy
 msgid "Normal"
 msgstr "F_ormato"
 
 #: 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
 #, fuzzy
 msgid "Low"
 msgstr "Novo"
@@ -3573,13 +3616,17 @@ msgstr "Novo"
 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 ""
 
@@ -3702,12 +3749,12 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 #, fuzzy
 msgid "No description available."
 msgstr "Nenhum sum�rio"
 
-#: 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"
@@ -3715,14 +3762,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 "Seg"
 
-#: 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 "
@@ -3733,17 +3780,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 "Enviar esta mensagem"
 
-#: 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 "N�o se consegui inicializar 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 ""
 
@@ -3795,7 +3842,7 @@ msgstr ""
 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 ""
@@ -3875,9 +3922,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
@@ -3894,13 +3941,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
 #, fuzzy
 msgid "No"
 msgstr "Novo"
@@ -3925,89 +3972,109 @@ msgstr "Semana"
 msgid "Month View"
 msgstr "M�s"
 
-#: 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
 #, fuzzy
 msgid "Calendar"
 msgstr "Novo Ca_lend�rio"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 #, fuzzy
 msgid "Folder containing appointments and events"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: 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 "Novo Ca_lend�rio"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Uma pasta contendo entradas de calend�rio"
+
+#: 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
 #, fuzzy
 msgid "Tasks"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Imprimir calend�rio"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Uma pasta contendo entradas de calend�rio"
+
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "Compromissos:"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso para hoje"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Seg"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "Seg"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Criar um novo contacto"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 #, fuzzy
 msgid "Create a new task"
 msgstr "Criar um novo contacto"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso para hoje"
@@ -4051,27 +4118,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
 #, fuzzy
 msgid "Message to Display"
 msgstr "Situa��o das mensagens"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 #, fuzzy
 msgid "Play sound:"
 msgstr "Esquecer _Senhas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Repeat the alarm"
-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
@@ -4100,117 +4167,117 @@ msgstr "Horas"
 msgid "minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "DiasRascunhos"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 #, fuzzy
 msgid "1 day"
 msgstr "Hoje"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "Semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 #, fuzzy
 msgid "1 week"
 msgstr "Semana"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "Horas"
 
-#: 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 "Minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 #, fuzzy
 msgid "1 minute"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " segundos"
 
-#: 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 "Descartar esta mensagem?"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 #, fuzzy
 msgid "Send an email"
 msgstr "Enviar"
 
-#: 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
 #, fuzzy, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "Novo compromisso"
 
-#: 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 "Novo compromisso"
 
-#: 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 "Novo compromisso"
 
-#: 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 "Novo compromisso"
 
-#: 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 "_Editar Compromisso"
 
-#: 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 "_Editar Compromisso"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, fuzzy, 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 ""
@@ -4233,7 +4300,7 @@ msgstr "Enviar"
 
 #: 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
 #, fuzzy
 msgid "Summary:"
 msgstr "Sum�rio:"
@@ -4331,7 +4398,7 @@ msgid "Days"
 msgstr "5 Dias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 #, fuzzy
 msgid "Friday"
 msgstr "Sex"
@@ -4345,7 +4412,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 "Segunda-feira"
 
@@ -4355,7 +4422,7 @@ msgid "S_un"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 #, fuzzy
 msgid "Saturday"
 msgstr "Domingo"
@@ -4370,7 +4437,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrar 1 semana"
 
 #: 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"
 
@@ -4389,7 +4456,7 @@ msgid "Task List"
 msgstr "Lista de tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 #, fuzzy
 msgid "Thursday"
 msgstr "Hoje"
@@ -4409,7 +4476,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
 #, fuzzy
 msgid "Tuesday"
 msgstr "Hoje"
@@ -4419,7 +4486,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 ""
 
@@ -4651,8 +4718,8 @@ msgid "No summary"
 msgstr "Nenhum sum�rio"
 
 #: 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
 #, fuzzy
 msgid "Save as..."
 msgstr "Gravar como VCard"
@@ -4725,31 +4792,31 @@ msgstr "Apagar"
 msgid "Enter Delegate"
 msgstr "Apagar"
 
-#: 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 "Compromissos:"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 #, fuzzy
 msgid "Reminder"
 msgstr "Enviar"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 #, fuzzy
 msgid "Recurrence"
 msgstr "Apagar todas as ocurr�ncias"
 
-#: 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 "Fontes"
 
-#: 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 "Seg"
@@ -4829,19 +4896,19 @@ msgstr "Hora de _fim de _encontro"
 msgid "_Start time:"
 msgstr "Hora de �n_icio de encontro"
 
-#: 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 "Apagar"
@@ -4886,7 +4953,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 ""
@@ -4899,7 +4966,7 @@ msgstr "Telem�vel"
 
 #: 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"
@@ -4978,52 +5045,52 @@ msgstr "h"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 #, fuzzy
 msgid "on"
 msgstr "Seg"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "Pr�_ximo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 #, fuzzy
 msgid "second"
 msgstr " segundos"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Outro"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "Hora"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "Pr�_ximo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Outro 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
 #, fuzzy
 msgid "day"
 msgstr "Hoje"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 #, fuzzy
 msgid "on the"
 msgstr "M�s"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 #, fuzzy
 msgid "occurrences"
 msgstr "Apagar todas as ocurr�ncias"
@@ -5129,7 +5196,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 "Remover grupo"
@@ -5140,7 +5207,7 @@ msgid "Progress"
 msgstr "Propriedades do alarme"
 
 #: 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 ""
 
@@ -5154,19 +5221,19 @@ msgstr "Prioridade:"
 msgid "_Status:"
 msgstr "S�b"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 #, fuzzy
 msgid "Basic"
 msgstr "Colar"
 
-#: 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 "Compromissos:"
 
-#: 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
 #, fuzzy
@@ -5238,13 +5305,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 "Apagar um contacto"
 
-#: 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"
@@ -5255,8 +5322,8 @@ msgstr "_Abrir"
 msgid "_Save as..."
 msgstr "Gravar como VCard"
 
-#: 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
@@ -5264,24 +5331,24 @@ msgstr "Gravar como VCard"
 msgid "_Print..."
 msgstr "Imprimir..."
 
-#: 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 "Cortar"
 
-#: 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 "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
 #, fuzzy
@@ -5311,12 +5378,12 @@ msgstr "Imprimir a mensagem seleccionada"
 msgid "_Delete Selected Tasks"
 msgstr "Apagar este item"
 
-#: 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"
@@ -5327,8 +5394,8 @@ msgstr "Pressione aqui para o livro de endere�os"
 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 "Cores"
@@ -5360,7 +5427,7 @@ msgid "Start Date"
 msgstr "Hora de �n_icio de encontro"
 
 #: 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"
@@ -5426,486 +5493,492 @@ 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 "Novo compromisso"
 
-#: 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 "Seg"
 
-#: 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 "_Tarefa"
 
-#: 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
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Hoje"
 
-#: 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 "Ir para a _pasta..."
 
-#: 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 "Nenhuma Informa��o"
 
-#: 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 "Configura��o do correio"
 
-#: 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 "Configura��o do correio"
 
-#: 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 "Gravar na _pasta..."
 
-#: 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 "Fontes"
 
-#: 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 "Imprimir calend�rio"
 
-#: 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 "Apagar esta ocurr�ncia"
 
-#: 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 "Apagar esta ocurr�ncia"
 
-#: 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 "Apagar todas as ocurr�ncias"
 
-#: 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 "Erro a gravar os atalhos."
 
-#: 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 _fim de _encontro"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Cores"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Nenhuma descri��o"
 
-#: 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 "Nenhuma Informa��o"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Novo Ca_lend�rio"
 
-#: 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 "Imposs�vel abrir o livro de endere�os"
 
 #. 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 "_Ac��es"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "S�b"
 
-#: 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
 #, fuzzy
 msgid "Declined"
 msgstr "Receber"
 
-#: 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
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 #, fuzzy
 msgid "Update"
 msgstr "Lista de tarefas"
 
-#: 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 "�cone_s pequenos"
 
-#: 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 "Receber"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Nenhuma Informa��o"
 
-#: 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 "Nenhuma Informa��o"
 
-#: 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
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Nenhuma Informa��o"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Seg"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _fim de _encontro"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Pedido de _encontro"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Seg"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Apagar um contacto"
 
-#: 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 "Mensagens enviadas"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Task Information"
 msgstr "Nenhuma Informa��o"
 
-#: 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 "_Tarefa"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 #, fuzzy
 msgid "Task Update"
 msgstr "Lista de tarefas"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 #, fuzzy
 msgid "Task Update Request"
 msgstr "_Pedido de tarefa"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 #, fuzzy
 msgid "Task Reply"
 msgstr "Responder"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Novo Ca_lend�rio"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Nenhuma Informa��o"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Encontrar mensagens"
 
-#: 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 "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Encontrar mensagens"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Encontrar mensagens"
 
-#: 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�o consegui correr o Bub 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"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
+msgstr "Criar um novo calend�rio"
 
-#: 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 "Criar um novo calend�rio"
+
+#: 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
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Cores"
 
-#: 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"
 
-#: 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 "_Nova pasta"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "_Nova pasta"
@@ -5956,7 +6029,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 ""
 
@@ -5970,56 +6043,56 @@ msgid "Resources"
 msgstr "Fontes"
 
 #: 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 "Grupo %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 "Fontes"
 
 #: 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 "Carro"
 
 #: 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 "Pessoas _Necess�rias"
 
 #: 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 "Apagar"
@@ -6110,42 +6183,49 @@ msgstr "Hora de �n_icio de encontro"
 msgid "Meeting _end time:"
 msgstr "Hora de _fim de _encontro"
 
-#: 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 "Abrir ficheiro"
 
-#: 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 "Criar um novo calend�rio"
 
-#: 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 "Criar um novo calend�rio"
 
-#: 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 "Erro a gravar os atalhos."
+
+#: 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 "Apagar um contacto"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "Cabe�alhos:"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Novo compromisso"
@@ -6160,7 +6240,13 @@ msgstr "Criar um novo calend�rio"
 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 "Alarmes"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6168,7 +6254,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"
@@ -6176,12 +6262,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 "Abrir calend�rio"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Abrir ficheiro"
@@ -6248,54 +6334,64 @@ msgstr "Outro"
 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
 #, fuzzy
 msgid "Event information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 msgid "Calendar information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Ano"
 
-#: 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 "Nenhuma Informa��o"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6536,7 +6632,7 @@ msgid "Print Calendar"
 msgstr "Imprimir calend�rio"
 
 #: 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 "Prever impress�o"
@@ -6561,7 +6657,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "O URI que o calend�rio mostrar�"
 
-#: 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"
@@ -6569,13 +6665,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 "Enviar esta mensagem"
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimir calend�rio"
@@ -6635,131 +6731,136 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Enviar"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Novo Ca_lend�rio"
 
-#: 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 "_Fechar Calend�rio"
 
-#: 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 "Outro"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8357,85 +8458,85 @@ msgstr "Abrir ficheiro"
 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 "Sincronizar"
 
-#: 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 "Erro a gravar os atalhos."
 
-#: 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 "Erro a gravar os atalhos."
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Encontrar mensagens"
 
-#: 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 "Enviar esta mensagem"
 
-#: 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 "Sincronizar"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: 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 "Anexar um ficheiro � mensagem"
 
-#: 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 "Anexar um ficheiro � mensagem"
 
-#: 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 "Erro a gravar os atalhos."
@@ -8478,12 +8579,12 @@ msgstr "Erro a gravar os atalhos."
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Moving messages"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Encontrar mensagens"
@@ -8790,7 +8891,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 ""
 
@@ -8847,51 +8948,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 "Abrir ficheiro"
 
-#: 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 ""
 
@@ -9083,7 +9184,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"
@@ -9092,11 +9193,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 ""
 
@@ -9113,7 +9214,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"
@@ -9163,70 +9264,78 @@ msgstr "N�o consigo abrir a localiza��o: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "N�o consigo abrir a localiza��o: %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 "Abrir calend�rio"
 
-#: 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 "Servidor:"
+
+#: 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:395
+#: 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
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Enviar uma nova mensagem"
 
-#: 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 "Anexar um ficheiro � mensagem"
 
-#: 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
@@ -9240,7 +9349,7 @@ 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
@@ -9248,22 +9357,17 @@ msgstr ""
 msgid "No such message"
 msgstr "Enviar a mensagem"
 
-#: 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
-#, fuzzy
-msgid "Scanning for new messages"
-msgstr "Encontrar mensagens"
-
-#: 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 ""
 
@@ -9280,6 +9384,11 @@ msgstr "Criar um novo calend�rio"
 msgid "Failed to cache message %s: %s"
 msgstr "Anexar um ficheiro � mensagem"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Anexar um ficheiro � mensagem"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 #, fuzzy
 msgid "Checking for new mail"
@@ -9330,74 +9439,69 @@ msgstr "Esquecer _Senhas"
 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 "Servidor:"
 
-#: 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 "Criar um novo calend�rio"
 
-#: 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 "Autentica��o"
 
-#: 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
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentica��o"
 
-#: 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"
@@ -9405,24 +9509,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
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Enviar a mensagem"
 
-#: 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 "Gravar a mensagem na pasta especificada"
 
-#: 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 ""
 
@@ -9497,8 +9601,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 ""
@@ -9510,7 +9614,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 ""
@@ -9524,32 +9628,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 "Criar um novo calend�rio"
 
-#: 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 "Criar um novo calend�rio"
 
-#: 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 ""
 
@@ -9570,6 +9674,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"
@@ -9579,12 +9684,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"
@@ -9608,7 +9715,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
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Criar um novo calend�rio"
@@ -9639,7 +9747,7 @@ msgid "Storing folder"
 msgstr "Sincronizar"
 
 #: 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 "N�o consigo abrir a localiza��o: %s"
@@ -9802,40 +9910,45 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %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
 #, 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
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Erro a gravar os atalhos."
 
-#: 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 "Erro a gravar os atalhos."
 
-#: 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 ""
 
@@ -9924,50 +10037,50 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr "Abrir calend�rio"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Encontrar mensagens"
 
-#: 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 "Abrir calend�rio"
 
-#: 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 "Criar um novo calend�rio"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: 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
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Enviar esta mensagem"
 
-#: 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 "Criar uma nova mensagem"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Imposs�vel abrir o livro de endere�os"
@@ -10233,40 +10346,40 @@ msgstr "Autentica��o"
 msgid "Authentication required"
 msgstr "Autentica��o"
 
-#: 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 "Criar um novo calend�rio"
 
-#: 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 "Autentica��o"
 
-#: 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"
@@ -10274,90 +10387,90 @@ 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
 #, fuzzy
 msgid "Sending message"
 msgstr "Mensagens enviadas"
 
-#: 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
 #, fuzzy
 msgid "HELO response error"
 msgstr "Outro"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentica��o"
 
-#: 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 ""
@@ -10365,77 +10478,68 @@ 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 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
 #, fuzzy
 msgid "attachment"
 msgstr "Anexo"
 
-#: 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 "Remover items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro � mensagem"
 
@@ -10469,7 +10573,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 "Pressione aqui para o livro de endere�os"
 
@@ -10480,7 +10584,7 @@ msgstr "Pressione aqui para o livro de endere�os"
 #. * 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 "Responder"
@@ -10488,7 +10592,7 @@ msgstr "Responder"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 #, fuzzy
 msgid "From:"
 msgstr "De"
@@ -10496,31 +10600,31 @@ msgstr "De"
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: 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 "Entre os endere�os que ir�o receber uma c�pia da mensagem"
 
-#: 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."
@@ -10531,12 +10635,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "Prioridade:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Nenhuma descri��o"
@@ -10551,117 +10655,133 @@ msgstr "Anexar um ficheiro"
 msgid "Could not create a PGP signature context"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 #, fuzzy
 msgid "Warning!"
 msgstr "Seg"
 
-#: 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
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: 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
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: 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
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Enviar esta mensagem"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Ficheiro com assinatura:"
 
-#: 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 "Criar uma nova mensagem"
 
-#: 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 "N�o consigo inicializar o componente de mail do Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10724,8 +10844,8 @@ msgstr "Assunto"
 msgid "Subject does not contain"
 msgstr "Assunto"
 
-#: 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?"
@@ -10881,8 +11001,9 @@ msgid "years"
 msgstr "Ano"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
-msgstr ""
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Nome completo:"
 
 #: filter/filter-datespec.c:269
 msgid "<click here to select a date>"
@@ -10939,13 +11060,12 @@ msgid "Add action"
 msgstr "_Ac��es"
 
 #: 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 "Nome completo:"
 
-#: 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
 #, fuzzy
 msgid "Select Folder"
 msgstr "_Nova pasta"
@@ -10957,7 +11077,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 ""
@@ -11140,238 +11260,242 @@ msgstr "Tamanho"
 
 #: filter/libfilter-i18n.h:7
 #, fuzzy
-msgid "contains"
-msgstr "_Ac��es"
-
-#: filter/libfilter-i18n.h:8
-#, fuzzy
 msgid "Copy to Folder"
 msgstr "Ir para a _pasta..."
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 #, fuzzy
 msgid "Date received"
 msgstr "Receber"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Date sent"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Deleted"
 msgstr "Apagar"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
 msgstr ""
 
+#: filter/libfilter-i18n.h:13
+#, fuzzy
+msgid "Draft"
+msgstr "Data"
+
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr ""
+#, fuzzy
+msgid "Exist"
+msgstr "Pr�_ximo"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "Ficheiro n�o encontrado"
-
-#: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "does not sound like"
-msgstr "Ficheiro n�o encontrado"
+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
 #, fuzzy
-msgid "Draft"
-msgstr "Data"
+msgid "Message Body"
+msgstr "Situa��o das mensagens"
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr ""
+#, fuzzy
+msgid "Message Header"
+msgstr "Situa��o das mensagens"
 
 #: filter/libfilter-i18n.h:22
 #, fuzzy
-msgid "Exist"
-msgstr "Pr�_ximo"
+msgid "Move to Folder"
+msgstr "Ir para a _pasta..."
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Sum�rio executivo"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
+#, fuzzy
+msgid "Play Sound"
+msgstr "Esquecer _Senhas"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#, fuzzy
+msgid "Read"
+msgstr "Remover"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
 #, fuzzy
-msgid "is after"
-msgstr "Data"
+msgid "Replied to"
+msgstr "Reponder para todos"
 
 #: filter/libfilter-i18n.h:29
-msgid "is before"
+msgid "Run Once"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+#, fuzzy
+msgid "Score"
+msgstr "Fontes"
 
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr ""
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#, fuzzy
+msgid "Sender"
+msgstr "Enviar"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr ""
+#, fuzzy
+msgid "Set Status"
+msgstr "Situa��o online"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Shell Command"
+msgstr "Sum�rio executivo"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Tamanho"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
-msgid "Label"
-msgstr ""
+#: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Source Account"
+msgstr "�cone_s pequenos"
 
 #: filter/libfilter-i18n.h:36
-msgid "Mailing list"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
-#, fuzzy
-msgid "Message Body"
-msgstr "Situa��o das mensagens"
-
 #: filter/libfilter-i18n.h:38
-#, fuzzy
-msgid "Message Header"
-msgstr "Situa��o das mensagens"
+msgid "Stop Processing"
+msgstr ""
 
-#: filter/libfilter-i18n.h:39
-#, fuzzy
-msgid "Move to Folder"
-msgstr "Ir para a _pasta..."
+#: 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 "Assunto"
 
 #: filter/libfilter-i18n.h:40
 #, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "Sum�rio executivo"
+msgid "Unset Status"
+msgstr "Situa��o online"
 
 #: filter/libfilter-i18n.h:41
 #, fuzzy
-msgid "Play Sound"
-msgstr "Esquecer _Senhas"
+msgid "contains"
+msgstr "_Ac��es"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
-#, fuzzy
-msgid "Read"
-msgstr "Remover"
+#: 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
 #, fuzzy
-msgid "Replied to"
-msgstr "Reponder para todos"
+msgid "does not return"
+msgstr "Ficheiro n�o encontrado"
 
 #: filter/libfilter-i18n.h:46
 #, fuzzy
-msgid "returns"
-msgstr "Ocupado"
+msgid "does not sound like"
+msgstr "Ficheiro n�o encontrado"
 
 #: 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
-#, fuzzy
-msgid "Score"
-msgstr "Fontes"
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
-#, fuzzy
-msgid "Sender"
-msgstr "Enviar"
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr ""
 
 #: filter/libfilter-i18n.h:51
 #, fuzzy
-msgid "Set Status"
-msgstr "Situa��o online"
+msgid "is after"
+msgstr "Data"
 
 #: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "Shell Command"
-msgstr "Sum�rio executivo"
+msgid "is before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Size (kB)"
-msgstr "Tamanho"
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-#, fuzzy
-msgid "Source Account"
-msgstr "�cone_s pequenos"
+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"
-msgstr "Assunto"
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Ocupado"
 
 #: filter/libfilter-i18n.h:61
-#, fuzzy
-msgid "Unset Status"
-msgstr "Situa��o online"
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr ""
 
 #: filter/rule-editor.c:180
 #, fuzzy
@@ -11411,32 +11535,32 @@ 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 "Seg"
 
-#: 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
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "Seg"
 
-#: 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 "Sincronizar"
 
-#: 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 "_Correio"
@@ -11494,41 +11618,41 @@ 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 "_Tarefa"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Sincronizar"
 
-#: 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
 #, fuzzy
 msgid "Settings"
 msgstr "Segundos"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "_Pasta"
 
-#: 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?"
@@ -11652,113 +11776,123 @@ msgid "Folder containing mail"
 msgstr "Uma pasta contendo items de correio"
 
 #: mail/component-factory.c:103
+msgid "Public Mail"
+msgstr ""
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Uma pasta contendo items de correio"
+
+#: mail/component-factory.c:104
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "_Pastas"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "_Pastas"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 #, fuzzy
 msgid "This folder cannot contain messages."
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 #, fuzzy
 msgid "Properties..."
 msgstr "Propriedades do alarme"
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propriedades"
 
-#: 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 "Enviar esta mensagem"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Criar uma nova mensagem"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Encontrar mensagens"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Criar uma nova mensagem"
 
-#: 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 "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "N�o consigo inicializar o componente de mail do 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 "Ano"
 
-#: 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
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades do alarme"
 
-#: 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 ""
@@ -11803,150 +11937,150 @@ msgstr " segundos"
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Assunto"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Situa��o das mensagens"
 
-#: 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
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Ficheiro n�o encontrado"
 
-#: 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
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Encontrar mensagens"
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "_Print"
 msgstr "Imprimir"
 
-#: 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 "Reponder para todos"
 
-#: 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 "Reponder para todos"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Reponder para todos"
 
-#: 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 "Cores"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Carro"
 
 #. 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
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Apagar"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: 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 "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Dru�da dos _filtros"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Uma pasta contendo items de correio"
@@ -12024,22 +12158,22 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr "Atalho para _barra do 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 "Horas"
 
-#: 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 "Utilizador:"
 
-#: 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 "Caminho"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -12057,15 +12191,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 "Como _Tabela"
 
 #: 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 ""
 
@@ -12142,8 +12276,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
@@ -12178,80 +12312,80 @@ 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
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: 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
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Situa��o das mensagens"
 
-#: 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 "Imprimir a mensagem seleccionada"
 
-#: 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"
@@ -12259,72 +12393,72 @@ 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
 #, fuzzy
 msgid "Filters"
 msgstr "_Pasta"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: 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
 #, fuzzy
 msgid " [script]"
 msgstr "Nenhuma descri��o"
 
-#: 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 "_Novo Contacto"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Seg"
 
-#: 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
 #, fuzzy
 msgid "Add Signature"
 msgstr "Ficheiro com assinatura:"
@@ -12367,16 +12501,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�cone_s pequenos"
 
-#: 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 ""
 
@@ -13090,80 +13224,76 @@ msgstr "N�o se consegui inicializar Bonobo"
 msgid "Could not create a S/MIME decode context."
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Anexo"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Criar um novo calend�rio"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Anexo"
 
-#: 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
 #, fuzzy
 msgid "Downloading images"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 #, fuzzy
 msgid "Loading message content"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr ""
 
-#: 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 "�brir em nova janela"
 
-#: 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
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gravar na _pasta..."
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gravar como VCard"
@@ -13173,154 +13303,150 @@ msgstr "Gravar como VCard"
 msgid "Pinging %s"
 msgstr "Sincronizar"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Adicionar anexo"
 
-#: 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
 #, fuzzy
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 #, fuzzy
 msgid "Bad Address"
 msgstr "Endere�o"
 
-#: 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 "Responder"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 #, fuzzy
 msgid "To"
 msgstr "Para:"
 
-#: 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 "_Correio"
 
-#: 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 "N�o se consegui inicializar Bonobo"
 
-#: 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 "_Pastas"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Nova pasta"
 
-#: 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 "N�o consigo abrir a localiza��o: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: 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 "_Nova pasta"
 
+#: 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 ""
@@ -13570,21 +13696,21 @@ msgstr ""
 msgid "User canceled operation."
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Mudar nome de atalho"
 
-#: 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 "Esquecer _Senhas"
@@ -13594,23 +13720,24 @@ msgstr "Esquecer _Senhas"
 msgid "Could not save signature file: %s"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 #, fuzzy
 msgid "Save signature"
 msgstr "Ficheiro com assinatura:"
 
-#: 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."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "Ficheiro com assinatura:"
 
-#: 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
 #, fuzzy
 msgid "Name:"
 msgstr "Nome"
@@ -13649,7 +13776,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 "_Pastas"
@@ -13684,72 +13811,72 @@ msgstr "Assunto"
 msgid "%s - Message"
 msgstr "Mensagem de _correio"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 #, fuzzy
 msgid "Seen"
 msgstr "Enviar"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Criar uma nova mensagem"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Encontrar mensagens"
 
-#: 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
 #, fuzzy
 msgid "Higher"
 msgstr "Cabe�alhos:"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 #, fuzzy
 msgid "Highest"
 msgstr "Cabe�alhos:"
 
-#: 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
 #, fuzzy
 msgid "Generating message list"
 msgstr "Encontrar mensagens"
@@ -13825,47 +13952,72 @@ msgstr "Reponder para todos"
 msgid "Review"
 msgstr "Prever impress�o"
 
-#: 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 "Cores"
+
+#: 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 "Carro"
+
+#: mail/message-tags.glade.h:8
+msgid "_Due by:"
+msgstr ""
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Nome completo:"
+
+#: mail/subscribe-dialog.c:229
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Encontrar mensagens"
 
-#: 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
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abrir ficheiro"
 
-#: 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 "_Pastas"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Gravar na _pasta..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Situa��o das mensagens"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr ""
 
@@ -24528,13 +24680,13 @@ msgstr ""
 msgid "No description"
 msgstr "Nenhuma descri��o"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 #, fuzzy
 msgid "Mail summary"
 msgstr "Nenhum sum�rio"
 
-#: 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 "_Pastas"
@@ -24545,24 +24697,24 @@ msgstr "_Pastas"
 #. (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 "Adicionar novo grupo"
 
-#: 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 ""
 
@@ -24605,11 +24757,11 @@ msgstr "Nenhuma descri��o"
 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 "Outro"
@@ -25977,6 +26129,11 @@ msgid ""
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Segundos"
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -26194,24 +26351,35 @@ msgid "Rename folder"
 msgstr "Abrir ficheiro"
 
 #: 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 "Gravar a mensagem na pasta especificada"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Criar um novo calend�rio"
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 #, fuzzy
 msgid "New..."
 msgstr "Novo"
@@ -26237,128 +26405,118 @@ 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 "_Nova pasta"
 
-#: 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 "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
 #, fuzzy
 msgid "Importing"
 msgstr "Seg"
 
-#: 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 "Erro a gravar os atalhos."
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Erro a gravar os atalhos."
 
-#: 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
 #, fuzzy
 msgid "Filename:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Select a file"
 msgstr "Ficheiro com assinatura:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 #, fuzzy
 msgid "File type:"
 msgstr "Nome completo:"
 
-#: 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 "Seg"
 
-#: 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 "_Nova pasta"
 
-#: 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 ""
 
@@ -26384,32 +26542,32 @@ msgstr "Sincronizar"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Sincronizar"
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Instala��o do Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Abrir ficheiro"
 
-#: 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 "Abrir ficheiro"
 
-#: 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 "Segundos"
 
-#: 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 "Criar um novo calend�rio"
 
-#: 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 "Gravar a mensagem na pasta especificada"
@@ -26450,47 +26608,47 @@ msgstr "Uma pasta contendo items de correio"
 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 "O Bug buddy n�o foi encontrado no seu $PATH."
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "N�o consegui correr o Bub buddy"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 #, fuzzy
 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 "Ir para a _pasta..."
 
-#: 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 "Criar um novo contacto"
 
-#: 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 "Seg"
 
-#: 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 "Seg"
 
-#: 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 "Seg"
@@ -26499,26 +26657,26 @@ msgstr "Seg"
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta 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 "Nome"
 
-#: 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 ""
@@ -26531,12 +26689,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"
@@ -26544,20 +26702,20 @@ 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
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configura��o do correio"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr ""
 
@@ -26715,59 +26873,63 @@ msgstr "Mudar nome de atalho"
 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 "N�o consigo abrir a localiza��o: %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 (...)"
@@ -26987,7 +27149,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 ""
@@ -27003,29 +27165,24 @@ msgstr "Atalho para _barra do Evolution"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Assistant"
-msgstr "Atalho para _barra do Evolution"
-
-#: shell/importer/import.glade.h:4
-#, fuzzy
 msgid "Import File (step 3 of 3)"
 msgstr "Ficheiro com assinatura:"
 
-#: 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 "Ficheiro com assinatura:"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 #, fuzzy
 msgid "Select a File (step 2 of 3)"
 msgstr "Ficheiro com assinatura:"
 
-#: 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"
@@ -27258,10 +27415,10 @@ msgstr "Ficheiro com assinatura:"
 #: 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 "_Ac��es"
 
@@ -27399,7 +27556,7 @@ msgid "Print this item"
 msgstr "Imprimir este item"
 
 #: 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
 #, fuzzy
 msgid "Save"
 msgstr "S�"
@@ -27428,7 +27585,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
 #, fuzzy
 msgid "_File"
 msgstr "_Pasta"
@@ -27521,7 +27678,7 @@ msgstr ""
 
 #: 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
@@ -27575,33 +27732,33 @@ msgstr "Gravar a mensagem na pasta especificada"
 
 #: ui/evolution-mail-global.xml.h:13
 #, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Ir para a _pasta..."
+
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
 msgid "Show message preview window"
 msgstr "Se uma previs�o da mensagem deve ser mostrada"
 
-#: 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 "_Pastas"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Filters..."
 msgstr "Dru�da dos _filtros"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "Prever impress�o"
 
-#: ui/evolution-mail-global.xml.h:19
-#, fuzzy
-msgid "_Subscribe to Folders..."
-msgstr "Ir para a _pasta..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
@@ -27708,7 +27865,7 @@ msgstr "Enviar esta mensagem"
 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 "_Pasta"
 
@@ -28049,7 +28206,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
@@ -28178,7 +28335,7 @@ msgstr "Nenhuma"
 msgid "_Resend..."
 msgstr "_Abrir"
 
-#: 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 "_Ferramentas"
 
@@ -28195,13 +28352,13 @@ msgstr "Novo compromisso"
 #: 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 "Cores"
 
 #: 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
 #, fuzzy
 msgid "_View"
 msgstr "_Novo"
@@ -28398,7 +28555,7 @@ msgstr ""
 msgid "Save the current file and close the window"
 msgstr "Ficheiro com assinatura:"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Help"
 msgstr "Casa"
@@ -28586,7 +28743,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Criar um novo calend�rio"
 
 #: 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
@@ -28605,127 +28762,147 @@ msgstr "Configura��o do co_rreio..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Configura��o do co_rreio..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Criar um novo calend�rio"
+
+#: ui/evolution.xml.h:29
+#, fuzzy
 msgid "Send / Receive"
 msgstr "Receber"
 
-#: 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
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Configura��o do correio"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configura��o do correio"
 
-#: 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
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostrar a barra de pastas"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: 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
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Imprimir a mensagem 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 "Evolution"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copiar"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Pasta"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Pasta"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 #, fuzzy
 msgid "_Import..."
 msgstr "Seg"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 #, fuzzy
 msgid "_Move..."
 msgstr "Sg"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 #, fuzzy
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Prefer�ncias"
+msgid "_Remove Other User's Folder"
+msgstr "Criar um novo calend�rio"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Abrir"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Receber"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Configura��o do co_rreio..."
+
+#: ui/evolution.xml.h:63
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "Mudar nome de atalho"
@@ -28979,12 +29156,12 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 #, fuzzy
 msgid "Search Editor"
 msgstr "_Contacto"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 #, fuzzy
 msgid "Save Search"
 msgstr "Ano"
@@ -29076,6 +29253,32 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "N�o se consegui inicializar Bonobo"
 
 #, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "Remover"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "Adicionar"
+
+#, fuzzy
+#~ msgid "Scanning for new messages"
+#~ msgstr "Encontrar mensagens"
+
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u bytes"
+
+#, fuzzy
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Atalho para _barra do Evolution"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Prefer�ncias"
+
+#, fuzzy
 #~ msgid "Error in search expression."
 #~ msgstr "Erro a gravar os atalhos."
 
@@ -29266,14 +29469,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Ficheiro com assinatura:"
 
 #, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "Ficheiro com assinatura:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Nome completo:"
-
-#, fuzzy
 #~ msgid "_HTML Signature:"
 #~ msgstr "Ficheiro com assinatura:"
 
@@ -29310,14 +29505,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Cabe�alhos:"
 
 #, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "Adicionar"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "Remover"
-
-#, fuzzy
 #~ msgid "Card: "
 #~ msgstr "Carro"
 
@@ -29530,10 +29717,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "_Tarefa"
 
 #, fuzzy
-#~ msgid "_Mail Settings..."
-#~ msgstr "Configura��o do co_rreio..."
-
-#, fuzzy
 #~ msgid "Forward _Quoted"
 #~ msgstr "Enviar esta mensagem"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9ba6f8341f..b58dd83b3c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,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-09-01 20:19-0300\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -318,11 +318,17 @@ msgstr "Sobrenome"
 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 contatos sem nome"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Vários VCards"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -333,46 +339,46 @@ 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 "Não foi possível iniciar 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 "Carregando..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 msgid "Reconnecting to LDAP server..."
 msgstr "Reconectando ao 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 "Adicionando cartão ao 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 "Removendo cartão do 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 cartão do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Recebendo resultados da busca LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr "Erro ao executar busca"
 
@@ -389,13 +395,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook não foi carregado\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 "Não foi possível iniciar o 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 "Não foi possível iniciar wombat"
@@ -470,10 +476,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Fábrica para o controle do Catálogo de Endereços exemplo"
 
 #: 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 "Contatos"
@@ -490,27 +496,37 @@ msgstr "Servidor LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Servidor LDAP contendo informação sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Contatos"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Pasta contendo informação sobre contatos"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Contato"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Create a new contact"
 msgstr "Criar um novo contato"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Nova lista de contatos"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "Lista de _contatos"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 msgid "Create a new contact list"
 msgstr "Criar uma nova lista de contatos"
 
@@ -547,7 +563,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "LDAP não está ativado nesta cópia do 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 "Não foi possível iniciar gnome-vfs"
 
@@ -555,11 +571,11 @@ msgstr "Não foi possível iniciar gnome-vfs"
 msgid "Other Contacts"
 msgstr "Outros contatos"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Não é possível abrir o catálogo de endereços"
 
-#: 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."
@@ -568,7 +584,7 @@ msgstr ""
 "Por favor, verifique se o arquivo existe e que você\n"
 "possui as permissões para acessá-lo."
 
-#: 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"
@@ -578,7 +594,7 @@ msgstr ""
 "significa que você forneceu uma URI incorreta ou que o\n"
 "servidor LDAP está fora do ar."
 
-#: 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"
@@ -590,7 +606,7 @@ msgstr ""
 "você deve recompilar o programa dos fontes em CVS após\n"
 "obter o OpenLDAP a partir do link abaixo.\n"
 
-#: 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"
@@ -600,36 +616,46 @@ msgstr ""
 "significa que você forneceu uma URI incorreta ou que o\n"
 "servidor está fora do ar."
 
-#: 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 "Falha ao se autenticar com o servidor LDAP"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "Entre senha para %s (usuário %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr "Nome começa com"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 msgid "Email begins with"
 msgstr "E-mail começa com"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categoria é"
 
 #. 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 "Qualquer campo contém"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Avançado..."
 
-#: 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"
@@ -637,7 +663,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"
@@ -645,25 +671,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 "Qualquer categoria"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "A URI que o navegador de pastas vai exibir"
 
@@ -730,52 +756,53 @@ msgid "  S_how Supported Bases "
 msgstr " _Verificar tipos suportados "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-msgid "&lt;&lt; Fewer Options"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr " _Remover"
-
-#: 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 "_Remover"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opções"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -915,48 +942,54 @@ msgstr "Um"
 
 #: 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 "_Escopo de busca:"
 
 #. 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"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Selecionar todos"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Excluída"
 
-#: 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"
@@ -967,7 +1000,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"
@@ -976,47 +1009,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 "Informação da fonte"
 
-#: 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 ao 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 não suportado"
 
-#: 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"
@@ -1024,7 +1057,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"
@@ -1033,7 +1066,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"
@@ -1041,7 +1074,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"
@@ -1051,7 +1084,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"
@@ -1061,20 +1094,20 @@ 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 "
@@ -1083,7 +1116,7 @@ msgstr ""
 "Este é o método que o Evolution usará para autenticá-lo. Note que a opção "
 "\"Endereço de e-mail\" requer acesso anônimo ao seu 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 "
@@ -1093,7 +1126,7 @@ msgstr ""
 "Este nome será usado para identificar sua conta. Ele é usado apenas para "
 "exibição."
 
-#: 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"
@@ -1101,11 +1134,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"
@@ -1114,26 +1147,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 "Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "Endereço de e-mail"
 
-#: 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
@@ -1141,49 +1174,50 @@ msgstr ""
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Adicionar"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Adicionar ação"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Adicionar ação"
 
-#: 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 "_Excluir todos"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Exibição"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Distinguished 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 ""
 
-#: 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
@@ -1193,101 +1227,102 @@ msgstr ""
 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 compromisso"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Alarme do 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
-msgid "_More Options &gt;&gt;"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Opções"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porta:"
 
-#: 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 "_Base de busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "Nome do _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Conta %d"
 
-#: 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 "Sem cartões"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Reconectando 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 "Geral"
 
-#: 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"
@@ -1302,8 +1337,8 @@ msgstr "Fábrica para interface para seleção de nomes do catálogo de endereç
 
 #. 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"
@@ -1334,11 +1369,11 @@ msgstr "(%d não exibidos)"
 msgid "Unnamed Contact"
 msgstr "Contato sem nome"
 
-#: 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 "Selecionar contatos do catálago de endereços"
 
-#: 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 "Remetente contém"
@@ -1412,7 +1447,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 "Detalhes"
 
@@ -1472,13 +1507,13 @@ msgstr "Deseja receber correio _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 "_Excluir"
 
@@ -1506,1027 +1541,1027 @@ msgstr "URL da agenda _pública:"
 msgid "_Web page address:"
 msgstr "Endereço 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
 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 "Afeganistão"
 
-#: 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 "Albânia"
 
-#: 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éria"
 
-#: 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ártica"
 
-#: 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 e 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 "Armênia"
 
-#: 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 "Austrália"
 
-#: 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 "Áustria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbaijão"
 
-#: 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 "Belarus"
 
-#: 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 "Butão"
 
-#: 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 "Bolívia"
 
-#: 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 "Bósnia e 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 "Ilhas 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 "Território do Oceano Índico Britânico"
 
-#: 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 "Bulgária"
 
-#: 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 "Camboja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Camarões"
 
-#: 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 "Ilhas Cayman"
 
-#: 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 Centro-Africana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Chade"
 
-#: 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 "Ilhas 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 "Ilhas 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 "Colômbia"
 
-#: 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 "Ilhas 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 do Marfim"
 
-#: 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 "Croácia"
 
-#: 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 "Republica 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 Leste"
 
-#: 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 "Equador"
 
-#: 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 "Egito"
 
-#: 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 "Guiné Equatorial"
 
-#: 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 "Estônia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Ilhas Falkland (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 "Ilhas Faroe"
 
-#: 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 "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
 msgid "France"
 msgstr "França"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Guiana 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 "Polinésia 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 "Territórios Franceses do Sul"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gâmbia"
 
-#: 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 "Geórgia"
 
-#: 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 "Alemanha"
 
-#: 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 "Grécia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Groenlândia"
 
-#: 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 "Guiné"
 
-#: 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é-Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Guiana"
 
-#: 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 "Ilhas Heard e 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 "Hungria"
 
-#: 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 "Islândia"
 
-#: 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 "Índia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonésia"
 
-#: 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 "Itália"
 
-#: 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ão"
 
-#: 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 "Jordânia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazaquistão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Quênia"
 
-#: 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 "Coréia, República da"
 
-#: 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 "Kirgiquistão"
 
-#: 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átvia"
 
-#: 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 "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 "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 "Lituânia"
 
-#: 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 "Macau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Macedônia"
 
-#: 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 "Malásia"
 
-#: 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 "Ilhas 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 "Mauritânia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Maurício"
 
-#: 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 "Micronésia"
 
-#: 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 "Coréia, República da"
 
-#: 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 "Mongólia"
 
-#: 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 "Marrocos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Moçambique"
 
-#: 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 "Namíbia"
 
-#: 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 "Antilhas 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 "Nova Caledônia"
 
-#: 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 "Nova Zelândia"
 
-#: 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 "Nicarágua"
 
-#: 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 "Ilhas 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 "Ilhas Marianas do Norte"
 
-#: 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ã"
 
-#: 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 "Paquistão"
 
-#: 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 "Território palestino"
 
-#: 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 Nova Guiné"
 
-#: 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 "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 "Polônia"
 
-#: 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 "Porto 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ão"
 
-#: 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 "Romênia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Federação Russa"
 
-#: 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 e 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 e 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 "São Tome e 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 "Arábia Saudita"
 
-#: 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 "Serra Leoa"
 
-#: 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 "Singapura"
 
-#: 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 "Eslováquia"
 
-#: 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 "Eslovênia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Ilhas Salomão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somália"
 
-#: 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 "África do Sul"
 
-#: 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 "Ilhas Georgia do Sul e Sandwich do Sul"
 
-#: 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 "Espanha"
 
-#: 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 e 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ão"
 
-#: 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 "Ilhas Svalbard e 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 "Suécia"
 
-#: 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 "Suíça"
 
-#: 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 "Formosa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tajiquistão"
 
-#: 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 "República Unida da Tanzânia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Tailândia"
 
-#: 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 e Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: 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 "Turquia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Turcomenistão"
 
-#: 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 "Ilhas Turks e 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 "Ucrânia"
 
-#: 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 "Emirados Á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 "Ilhas ao Largo dos Estados Unidos"
 
-#: 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 "Uzbequistão"
 
-#: 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 "Vietnã"
 
-#: 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 "Ilhas Virgens, Inglaterra"
 
-#: 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 "Ilhas Virgens, EUA"
 
-#: 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 "Ilhas Wallis e 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 Ocidental"
 
-#: 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 "Yugoslávia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Zâmbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbábue"
 
@@ -2563,20 +2598,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Não foi possível encontrar widget para um 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 "Adicionar rápido de contato"
 
-#: 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 completo"
 
-#: 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 "Nome 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 "E-mail"
 
@@ -2598,6 +2633,19 @@ msgstr ""
 "%s já existe\n"
 "Você deseja sobrescrevê-lo?"
 
+#: 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 "Sobrescrever arquivo?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Endereço _2:"
@@ -2728,7 +2776,7 @@ msgstr "contact-list-editor"
 msgid "Contact List Editor"
 msgstr "Editor de lista de contatos"
 
-#: 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 "Salvar lista como VCard"
 
@@ -2778,7 +2826,7 @@ msgstr ""
 "pasta. Você deseja adicioná-lo mesmo assim?"
 
 #: 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 "Busca avançada"
 
@@ -2787,24 +2835,24 @@ msgstr "Busca avançada"
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Sem cartões"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 cartão"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d cartões"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 msgid "Error getting book view"
 msgstr "Erro ao obter visão de livro"
 
-#: 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"
@@ -2816,10 +2864,10 @@ msgid "Success"
 msgstr "Sucesso"
 
 #: 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 "Erro desconhecido"
 
@@ -2827,7 +2875,7 @@ msgstr "Erro desconhecido"
 msgid "Repository offline"
 msgstr "Repositório off-line"
 
-#: 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 "Permissão negada"
@@ -2848,8 +2896,8 @@ msgstr "Protocolo não suportado"
 #: 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 "Cancelada"
 
@@ -2897,7 +2945,7 @@ msgstr "Erro ao remover 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 "Erro ao remover cartão"
 
@@ -2912,9 +2960,8 @@ msgstr "Exibir cartões"
 #: 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
@@ -3004,7 +3051,7 @@ msgstr "Catálogo de endereços"
 
 #: 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 "Salvar como VCard"
@@ -3090,7 +3137,7 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Colar"
 
-#: 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
@@ -3098,8 +3145,8 @@ msgstr "Colar"
 msgid "Delete"
 msgstr "Excluir"
 
-#: 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 "_Visão atual"
@@ -3108,7 +3155,7 @@ msgstr "_Visão atual"
 #. 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"
 
@@ -3116,11 +3163,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"
@@ -3252,7 +3299,7 @@ msgid "Include:"
 msgstr "Incluir:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Paisagem"
 
@@ -3277,7 +3324,7 @@ msgid "Options"
 msgstr "Opções"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientação"
 
@@ -3300,7 +3347,7 @@ msgstr "Fonte de 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 "Retrato"
 
@@ -3362,20 +3409,20 @@ msgstr "Compromisso sem nome"
 
 #: 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"
 
@@ -3386,13 +3433,17 @@ msgstr "Baixa"
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: 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 "Erro ao comunicar com o servidor de 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 "Não foi possível ler os dados do aplicativo de agenda do pilot"
 
@@ -3502,11 +3553,11 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar compromisso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Sem descrição disponível."
 
-#: 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"
@@ -3518,13 +3569,13 @@ msgstr ""
 "com notificações por e-mail. O Evolution exibirá\n"
 "no lugar uma caixa de diálogo de lembrete 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 "Alerta"
 
-#: 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 "
@@ -3541,16 +3592,16 @@ msgstr ""
 "\n"
 "Você tem certeza que deseja executar este programa?"
 
-#: 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 "Não me pergunte novamente."
 
-#: 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 "Não foi possível iniciar 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 "Não foi possível criar a fábrica de serviço de notificação de alarme"
 
@@ -3599,7 +3650,7 @@ msgstr "%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 ""
@@ -3678,9 +3729,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
@@ -3697,13 +3748,13 @@ msgid "Assigned"
 msgstr "Atribuido"
 
 #: 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 "Sim"
 
 #: 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 "Não"
 
@@ -3723,82 +3774,102 @@ msgstr "Visão de semana"
 msgid "Month View"
 msgstr "Visão de mês"
 
-#: 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 "Pasta contendo compromissos e 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 da agenda _pública:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Pasta contendo compromissos e eventos"
+
+#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
+#: calendar/importers/icalendar-importer.c:704
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Pasta contendo itens de tarefa"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Imprimir cartões"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Pasta contendo itens de tarefa"
+
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Configurações de fontes de notícias"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso"
@@ -3841,29 +3912,30 @@ msgid "Alarm Repeat"
 msgstr "Repetição do 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 ""
+"Este é um lembrete por e-mail, mas o Evolution ainda não suporta este tipo "
+"de lembrete. Você não será capaz de editar as opções deste lembrete."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Mensagem a exibir"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Tocar um som:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Repetir o alarme"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Executar um 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 é um lembrete por e-mail, mas o Evolution ainda não suporta este tipo "
-"de lembrete. Você não será capaz de editar as opções deste lembrete."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Com estes argumentos:"
@@ -3887,110 +3959,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 dias"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 dia"
 
-#: 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 um som"
 
-#: 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 "Exibir uma mensagem"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Enviar um 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 "Executar um programa"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Ação desconhecida a ser executada"
 
-#: 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 do início do compromisso"
 
-#: 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 após o início do compromisso"
 
-#: 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 no início do compromisso"
 
-#: 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 do término do compromisso"
 
-#: 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 após o término do compromisso"
 
-#: 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 no término do compromisso"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s em %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 um tipo de gatilho desconhecido"
@@ -4011,7 +4083,7 @@ msgstr "Lembretes"
 
 #: 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 "Resumo:"
 
@@ -4094,7 +4166,7 @@ msgid "Days"
 msgstr "Dias"
 
 #: 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 "Sexta-feira"
 
@@ -4107,7 +4179,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 "Segunda-feira"
 
@@ -4117,7 +4189,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: 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"
 
@@ -4130,7 +4202,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Exibir _números de semana no navegador de datas"
 
 #: 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 "Domigo"
 
@@ -4149,7 +4221,7 @@ msgid "Task List"
 msgstr "_Lista de tarefas"
 
 #: 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 "Quinta-feira"
 
@@ -4166,7 +4238,7 @@ msgid "Time format:"
 msgstr "Formato da 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 "Terça-feira"
 
@@ -4175,7 +4247,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 "Quarta-feira"
 
@@ -4400,8 +4472,8 @@ msgid "No summary"
 msgstr "Sem resumo"
 
 #: 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 "Salvar como..."
 
@@ -4472,27 +4544,27 @@ msgstr "Delegar para:"
 msgid "Enter Delegate"
 msgstr "Entrar 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 "Compromisso"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Repetição"
 
-#: 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 "Agendamento"
 
-#: 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ão"
 
@@ -4561,19 +4633,19 @@ msgstr "Hora de tér_mino:"
 msgid "_Start time:"
 msgstr "Hora de _início:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Um organizador é exigido."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Pelo menos um participante é necessário."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Esta pessoa já participa da reunião!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Delegar para..."
 
@@ -4613,7 +4685,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: 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"
@@ -4625,7 +4697,7 @@ msgstr "Papel"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4701,48 +4773,48 @@ msgstr "º"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso possui repetições que o Evolution não pode editar."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "Neblina"
 
-#: 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 "Ohrid"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "Norte"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "lista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Outro 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
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "ocorrências"
 
@@ -4836,7 +4908,7 @@ msgstr "Concluída em:"
 
 #: 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 "Necessita ação"
 
@@ -4845,7 +4917,7 @@ msgid "Progress"
 msgstr "Progresso"
 
 #: 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:"
 
@@ -4857,17 +4929,17 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: 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 "Atribuição"
 
-#: 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:"
@@ -4937,12 +5009,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 "Excluindo objetos selecionados"
 
-#: 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"
@@ -4952,30 +5024,30 @@ msgstr "_Abrir"
 msgid "_Save as..."
 msgstr "Salvar 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 "_Imprimir..."
 
-#: 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 "Recor_tar"
 
-#: 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"
@@ -5004,12 +5076,12 @@ msgstr "_Marcar tarefas como concluídas"
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: 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 "Atualizando 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 "Clique para adicionar uma tarefa"
@@ -5018,8 +5090,8 @@ msgstr "Clique para adicionar uma tarefa"
 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 "Concluída"
 
@@ -5048,7 +5120,7 @@ msgid "Start Date"
 msgstr "Data de início"
 
 #: 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 "Resumo"
@@ -5115,123 +5187,123 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Novo _compromisso"
 
-#: 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 "Novo _evento de dia inteiro"
 
-#: 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 "Reunião"
 
-#: 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 "Nova tarefa"
 
-#: 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 para _hoje"
 
-#: 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 para _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
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar informação de livre/ocupado"
 
-#: 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 "Configuração"
 
-#: 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 "Configuração"
 
-#: 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 "Salvar _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 "Agendar _reunião"
 
-#: 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 "Encaminar 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 "Tornar esta ocorrência _móvel"
 
-#: 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 "Excluir esta _ocorrência"
 
-#: 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 "Excluir _todas as ocorrências"
 
-#: 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 ""
 "As ferramentas do GNOME Pilot não aparentam estar instaladas no seu 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 "Erro ao executar %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 "Concluída "
 
-#: 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 "Informação de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "Erro de 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 "Uma razão desconhecida"
 
 #. 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."
@@ -5239,328 +5311,334 @@ msgstr ""
 "<br> Por favor veja a seguinte informação e então selecione uma ação do menu "
 "abaixo."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Nenhum</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "_Local:"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "Estado:"
 
-#: 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 "Aceito"
 
-#: 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 "Aceito preliminarmente"
 
-#: 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 "Recusado"
 
-#: 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 "Desconhecido"
 
-#: 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 "Escolher uma ação:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Atualizar"
 
-#: 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 "Aceitar"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Enviar informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Atualizar estado do respondente"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Enviar informação mais recente"
 
-#: 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> publicou informação de reunião."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Informação de reunião"
 
-#: 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> requisita a sua presença em uma reunião."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Proposta de reunião"
 
-#: 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> deseja adicioná-lo a uma reunião existente."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Atualização de reunião"
 
-#: 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> deseja receber a informação de reunião mais recente."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "_Pedido de atualização de reunião"
 
-#: 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> respondeu a um pedido de reunião."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Resposta a reunião"
 
-#: 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> cancelou a reunião."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Cancelamento de reunião"
 
-#: 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> enviou uma mensagem incompreensível."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Mensagem de reunião inválida"
 
-#: 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> publicou informação de tarefa."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Informação de tarefa"
 
-#: 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> requisita que você execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
-#: 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> deseja acrescentá-lo a uma tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Atualização de tarefa"
 
-#: 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> deseja receber a informação de tarefa mais recente."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Pedido de atualização de tarefa"
 
-#: 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> respondeu a uma atribuição de tarefa."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Resposta a tarefa"
 
-#: 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> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Cancelamento de tarefa"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Mensagem de tarefa inválida"
 
-#: 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> publicou informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Informação de livre/ocupado"
 
-#: 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> requisita sua informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Pedido de livre/ocupado"
 
-#: 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> respondeu a um pedido de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Resposta de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de livre/ocupado inválida"
 
-#: 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 "A mensagem não aparenta estar formada corretamente."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contém apenas pedidos não suportados."
 
-#: 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 "O anexo não contém uma mensagem de agenda válida"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo não contém itens visualizáveis de agenda"
 
-#: calendar/gui/e-itip-control.c: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 "O item não pôde 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 "Não foi possível abrir pasta em `%s'"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Atualização concluí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 "O arquivo de agenda não pôde ser atualizado!\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 ""
 "Estado do participante não pôde ser atualizado pois o item não existe mais"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1573
 #, fuzzy
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta não é de um participante atual. Adicioná-lo como participante?"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Estado do participante não pôde ser atualizado devido a um estado inválido!\n"
 
-#: calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "Não foi possível abrir pasta em `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Estado do participante não pôde ser atualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Remoção concluí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 "Item 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 "O item não pôde ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Selecionar pasta"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Selecionar pasta"
@@ -5606,7 +5684,7 @@ msgstr "data-inicio"
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: 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 obrigatórios"
 
@@ -5620,52 +5698,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 "Indivíduo"
 
 #: 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 "Sala"
 
 #: 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 "Moderador"
 
 #: 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 "Participante obrigatório"
 
 #: 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 "Participante 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 "Não participante"
 
 #: 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 "Preliminar"
 
 #: 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"
 
@@ -5755,43 +5833,50 @@ msgstr "Hora de _início da reunião:"
 msgid "Meeting _end time:"
 msgstr "Hora de _término da reunião:"
 
-#: 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 "Abrindo tarefas em %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 "Não foi possível carregar as tarefas em `%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 "O método necessário para carregar `%s' não é suportado"
 
-#: 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 "Não foi possível abrir pasta em `%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 "Erro ao iniciar %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data de conclusão"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "Excluindo permanentemente pasta"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
@@ -5805,7 +5890,13 @@ msgstr "Não foi possível abrir pasta em `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "O método necessário para abrir `%s' não é suportado"
 
-#: 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 em %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5813,7 +5904,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"
@@ -5821,12 +5912,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 "Abrindo agenda em %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Abrindo pasta %s"
@@ -5887,47 +5978,57 @@ msgstr "Outubro"
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Pelo menos um participante é necessário"
-
-#: 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 "Um organizador deve ser configurado."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Pelo menos um participante é necessário"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Informação de evento"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Informação de tarefa"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Informação de diário"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Informação de livre/ocupado"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Informação de agenda"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr "Atualizado"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr "Contra proposta"
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Informação de livre/ocupado"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "Informação de agenda"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Você deve ser um participante do evento."
 
@@ -6162,7 +6263,7 @@ msgid "Print Calendar"
 msgstr "Imprimir 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 "Visualizar impressão"
@@ -6186,7 +6287,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "A URI da pasta de tarefas a ser exibida"
 
-#: 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 "
@@ -6200,12 +6301,12 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: 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 "Não me pergunte novamente."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimir cartões"
@@ -6279,17 +6380,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Não foi possível conectar ao repositório: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Lembrete"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mensagem de agenda"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6298,84 +6399,84 @@ msgstr ""
 "O Evolution achou arquivos de correio do Pine.\n"
 "Você gostaria de importá-los no 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 o argumento 1 seja uma 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 "O argumento 1 de make-time deve ser uma string de data ISO 8601"
 
-#: 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 o argumento 1 seja um 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 o argumento 2 seja um inteiro"
 
-#: 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 o argument 1 seja um 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 o argument 1 seja um 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 o argument 1 seja um 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 o argument 2 seja um 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 o argument 1 seja uma string"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que o argument 2 seja uma string"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6383,11 +6484,11 @@ msgstr ""
 "contains? espera que o argument 1 seja um de \"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 pelo 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)"
@@ -6395,22 +6496,27 @@ msgstr ""
 "has-categories? espera que todos os argumentos sejam strings ou somente um "
 "argumento que seja o falso booleano (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? espera 1 argumento"
 
-#: 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 o argumento 1 seja um 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 "Avaliação da expressão de busca não forneceu um valor booleano"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Outro erro"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8003,82 +8109,82 @@ msgstr "Armazenando pasta '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Você deve estar trabalhando conectado para completar esta operação"
 
-#: 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 pastas"
 
-#: 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 "Erro ao analisar 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 "Erro ao executar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Não é possível abrir a pasta de fila"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Não é possível processar a pasta de fila"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obtendo mensagem %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Não é possível abrir mensagem"
 
-#: 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 "Falhou na mensagem %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 pasta"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtendo mensagem %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 "Falhou na mensagem %d de %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Falhou a decodificação da mensagem."
 
-#: 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 "Falhou a criação de cache para mensagem %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 "Falhou a criação de cache para mensagem %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 "Erro ao executar busca por filtro: %s: %s"
@@ -8125,11 +8231,11 @@ msgstr "Operação não suportada: busca por expressão: para %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operação não suportada: busca por uids: para %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Movendo mensagens"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Copiando mensagens para %s"
@@ -8455,7 +8561,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 "Resposta de autenticação inválida do servidor."
 
@@ -8512,52 +8618,52 @@ msgstr "Autenticação POP antes de SMTP usando uma fonte não POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Falha ao compilar expressão regular: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "A URL '%s' precisa de um componente nome do usuário"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "A URL '%s' precisa de um componente máquina"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "A URL '%s' precisa de um componente caminho"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %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 "Falha na consulta de nome: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Falhou a consulta de máquina: %s: máquina não encontrada"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Falhou a consulta de máquina: %s: razão desconhecida"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Falhou a consulta de máquina: %s: máquina não encontrada"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Falhou a consulta de máquina: %s: razão desconhecida"
@@ -8756,7 +8862,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"
@@ -8765,11 +8871,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 ""
 
@@ -8791,7 +8897,7 @@ msgstr ""
 "Você deseja aceitá-lo mesmo assim?"
 
 #. 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"
@@ -8846,68 +8952,76 @@ msgstr "Não é possível renomear pasta: %s: Operação inválida"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Não é possível renomear pasta: %s: Não existe tal pasta"
 
-#: 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 "Operação 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 "O servidor desconectou 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 "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do 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 "Falhou o comando 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 "Resposta do servidor terminou cedo demais."
 
-#: 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 "Resposta do servidor IMAP não contém informação 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 "Resposta OK inesperada do 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 "Não foi possível criar o diretório %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 "Não foi possível carregar resumo para %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 "A pasta foi destruída e recriada no 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 "Procurando mensagens alteradas"
 
-#: 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 "Falhou a decodificação da mensagem."
 
-#: 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
@@ -8923,28 +9037,24 @@ msgstr ""
 "Não é possível obter mensagem: %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 "Não existe tal mensagem"
 
-#: 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 "Esta mensagem não está disponível no momento"
 
-#: 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 "Pegando informação de resumo para novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Procurando novas mensagens"
-
-#: 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 "Não foi possível localizar corpo da mensagem na resposta FETCH."
 
@@ -8961,6 +9071,11 @@ msgstr "Não foi possível abrir o diretório cache: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Falhou a criação de cache para mensagem %s: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Falhou a criação de cache para mensagem %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Verificando novas mensagens"
@@ -9007,77 +9122,72 @@ msgstr "Senha"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Esta opção conectará ao servidor IMAP usando uma senha em texto claro."
 
-#: 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 serviço para %s em %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 "Conexão 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 "Não foi possível conectar à %s (porta %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 ""
 "Não é possível conectar ao servidor POP.\n"
 "Erro ao enviar nome do usuário: %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 "Operação não 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 "Falhou a autenticação."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "A pasta não está vazia"
-
-#: 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 "O servidor IMAP %s não suporta o tipo de autenticação pedido %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 "Sem suporte para o tipo de autenticação %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 "%sPor favor entre a senha 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 "Você não entrou uma senha."
 
-#: 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"
@@ -9088,24 +9198,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 "Não existe a pasta %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 "O nome da pasta não pode conter o caractere 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 "Erro desconhecido: %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 "A pasta pai não pode conter sub-pastas"
 
@@ -9181,8 +9291,8 @@ msgid ""
 msgstr "Para ler e armazenar correio local em arquivos de fila mbox padrão."
 
 #: 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 "Raiz de armazenagem %s não é um caminho absoluto"
@@ -9194,7 +9304,7 @@ msgstr "Raiz de armazenagem %s não é um diretório comum"
 
 #: 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 "Não é possível obter pasta: %s: %s"
@@ -9208,32 +9318,32 @@ msgstr "Repositórios locais não possuem uma caixa de entrada"
 msgid "Local mail file %s"
 msgstr "Arquivo de correio 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 "Não foi possível renomear pasta %s para %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 "Não foi possível renomear pasta: %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 "Não foi possível excluir arquivo de resumo de pasta `%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 "Não foi possível excluir arquivo de índice de pasta `%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 "Não foi possível salvar resumo: %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 "Não é possível adicionar mensagem ao resumo: razão desconhecida"
 
@@ -9253,6 +9363,7 @@ msgstr "Conteúdo de mensagem inválido"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9264,12 +9375,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 "Pasta `%s' não 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"
@@ -9295,7 +9408,8 @@ msgid "not a maildir directory"
 msgstr "não é um diretório 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 "Não foi possível varrer pasta `%s': %s"
@@ -9325,7 +9439,7 @@ msgid "Storing folder"
 msgstr "Armazenando pasta"
 
 #: 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 "Não é possível criar bloqueio de pasta em %s: %s"
@@ -9494,40 +9608,45 @@ msgstr "`%s' não é um diretório."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Não é possível abrir diretório 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 "Pastas de fila não podem ser renomeadas"
 
-#: 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 "Raiz de armazenagem %s não é um diretório comum"
 
-#: 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 "Pasta `%s/%s' não 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' não é um arquivo comum."
+
+#: 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 "Arquivo de fila de correio %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 "Pastas de fila não podem ser renomeadas"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Pastas de fila não podem ser renomeadas"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Pastas de fila não podem ser excluídas"
 
@@ -9621,50 +9740,50 @@ msgstr "Cancelar"
 msgid "Operation failed: %s"
 msgstr "Operação cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Recuperando resumo 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 "Operação cancelada"
 
-#: 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 "Não é possível obter pasta: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Excluindo permanentemente mensagens excluídas"
 
-#: 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 "Não existe mensagem com 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 "Recuperando mensagem 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 ""
 "Não é possível obter mensagem: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitação desconhecida"
@@ -9939,45 +10058,45 @@ msgstr "Falha de autenticação temporária"
 msgid "Authentication required"
 msgstr "Autenticação exigida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Erro na resposta de 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 ""
 "Não é possível conectar ao servidor POP.\n"
 "Erro ao enviar nome do usuário: %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 "A mensagem não aparenta estar formada corretamente."
 
-#: 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 "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Erro na resposta de 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 "O servidor SMTP %s não suporta o mecanismo de autenticação pedido %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 entre a senha 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"
@@ -9988,90 +10107,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 "Entrega de correio 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 "Não é possível enviar mensagem: endereço do remetente não é válido."
 
-#: 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 mensagem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Não é possível enviar mensagem: não foram definidos destinatários."
 
-#: 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 "Não é possível enviar mensagem: não foram definidos destinatários."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "Saudação 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 "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "Autenticação SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao criar objeto de autenticação 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 "Tempo excedido no pedido AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Falhou o pedido 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 "Resposta de autenticação inválida do 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 "Tempo excedido no pedido MAIL FROM: %s: a mensagem não foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Erro na resposta de MAIL FROM: %s: a mensagem não foi enviada"
 
-#: 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 "Tempo excedido no pedido RCPT TO: %s: a mensagem não foi enviada"
 
-#: 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 "Tempo excedido no pedido DATA: %s: a mensagem não foi enviada"
@@ -10079,82 +10198,73 @@ msgstr "Tempo excedido no pedido DATA: %s: a mensagem não foi enviada"
 #. 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 "Erro na resposta de 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 ""
 "Tempo excedido no envio de DATA: terminação de mensagem: %s: a mensagem não "
 "foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta de autenticação inválida do 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 "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "Erro na resposta de 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 "Tempo excedido no pedido AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Erro na resposta de 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 "anexo"
 
-#: 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 "Remover itens selecionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Anexar um arquivo à mensagem"
 
@@ -10186,7 +10296,7 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir exibição automática de anexo"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Clique aqui para o catálogo de endereços"
 
@@ -10197,45 +10307,45 @@ msgstr "Clique aqui para o catálogo de endereços"
 #. * 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:"
 
 #.
 #. * 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 "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinatários da mensagem"
 
-#: 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 "Entre os endereços que receberão uma cópia da mensagem"
 
-#: 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 "Porto"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Sem descrição"
@@ -10266,7 +10376,7 @@ msgstr "Anexar um arquivo"
 msgid "Could not create a PGP signature context"
 msgstr "Não foi possível criar um contexto de assinatura PGP."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10275,34 +10385,34 @@ msgstr ""
 "Erro ao ler arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Alerta!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Arquivo existe, sobrescrever?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acessar arquivo: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Não foi possível recuperar mensagem do editor"
 
-#: 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 ""
 "Não é possível buscar no arquivo: %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 ""
 "Não é possível truncar arquivo: %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 ""
 "Erro ao salvar automaticamente mensagem: %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?"
@@ -10337,28 +10447,39 @@ msgstr ""
 "O Ximian Evolution encontrou arquivos não salvos de uma sessão anterior.\n"
 "Você gostaria de tentar recuperá-los?"
 
-#: composer/e-msg-composer.c: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 ""
+"Esta assinatura foi modificada, mas não foi salva.\n"
+"\n"
+"Você deseja salvar as suas modificações?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Arquivo de assinatura:"
 
-#: 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 "Redigir uma mensagem"
 
-#: 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."
@@ -10366,7 +10487,18 @@ msgstr ""
 "Não foi possível criar janela de redator:\n"
 "Não é possível ativar o controle seletor de endereços."
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c: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ão foi possível criar janela de redator:\n"
+"Não é possível ativar o componente editor de HTML."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10374,7 +10506,7 @@ msgstr ""
 "Não foi possível criar janela de redator:\n"
 "Não é possível ativar o componente editor de HTML."
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 #, fuzzy
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
@@ -10383,7 +10515,7 @@ msgstr ""
 "<b>(O redator contém um corpo de mensagem não texto, o qual não pode ser "
 "editado.)<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."
@@ -10391,8 +10523,9 @@ msgstr ""
 "Não foi possível criar janela de redator porque você ainda não\n"
 "configurou nunhuma identidade no componente de correio."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Não é possível iniciar o redator do Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10443,8 +10576,8 @@ msgstr "Assunto contém"
 msgid "Subject does not contain"
 msgstr "Assunto não contém"
 
-#: 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?"
@@ -10593,7 +10726,8 @@ msgid "years"
 msgstr "anos"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Você esqueceu de escolher uma data."
 
 #: filter/filter-datespec.c:269
@@ -10648,15 +10782,12 @@ msgid "Add action"
 msgstr "Adicionar ação"
 
 #: 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 ""
-"Você esqueceu de escolher uma pasta.\n"
-"Por favor volte e especifique uma pasta válida para onde entregar correio."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Você deve nomear esta pasta virtual."
 
-#: 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 "Selecionar pasta"
 
@@ -10669,7 +10800,7 @@ msgstr ""
 "Erro na expressão 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"
@@ -10857,228 +10988,232 @@ msgid "Beep"
 msgstr "Belém"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contém"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar para pasta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data de recebimento"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data de envio"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Excluída"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "não contém"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "não termina com"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "não existe"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "não existe"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "não soa como"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "não começa com"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Não existe"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Rascunho"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "termina com"
-
-#: 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 "Expressão"
 
-#: 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 "foi após"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "foi antes"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "Marcada"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "é maior que"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "é menor que"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "não é"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Marcada"
-
-#: 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 discussão"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Corpo da mensagem"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Cabeçalho da mensagem"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Mover para pasta"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Enviar mensagem ao contato"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar um som:"
 
-#: 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 "Lida"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Destinatários"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Casamento com expressão regular"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Em resposta a"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "é maior que"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "é 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 "Pontuação"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Remetente"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Atribuir estado"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Shelton"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Tamanho (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "soa como"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Conta fonte"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Cabeçalho específico"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "começa com"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: 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 "Assunto"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Atribuir estado"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "contém"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "não contém"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "não termina com"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "não existe"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "não existe"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "não soa como"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "não começa com"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "termina com"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "Marcada"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "foi após"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "foi antes"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "é maior que"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "é menor que"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Marcada"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "não é"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "é"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "é maior que"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "é menor que"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "soa como"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "começa com"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regras"
@@ -11112,31 +11247,31 @@ msgstr "Você precisa especificar pelo menos uma pasta como uma fonte."
 msgid "Evolution is importing your old Elm mail"
 msgstr "O Evolution está importando seu correio antigo 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 aguarde"
 
-#: 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 "Varrendo %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 "Correio"
 
@@ -11197,39 +11332,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 "O Evolution está importando seus dados antigos do 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 "Lixeira"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Arquivo de correio 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 "Varrendo diretório"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Iniciando a importação"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Configurações"
 
-#: 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?"
@@ -11346,26 +11481,36 @@ msgid "Folder containing mail"
 msgstr "Pasta contendo correio"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Público"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Pasta contendo correio"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Lixeira virtual"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Pasta lixeira virtual"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Esta pasta não pode conter mensagens."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Modificar as propriedades desta pasta"
 
-#: 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."
@@ -11373,80 +11518,81 @@ msgstr ""
 "Algumas de suas configurações de correio aparentam estar corrompidas, por "
 "favor verifique se tudo está em ordem."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Você não estabeleceu um método de transporte de correio"
 
-#: mail/component-factory.c: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 "Alerta: Mensagem modificada"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Redigir uma mensagem"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Nova mensagem"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Imprimir mensagem"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nova mensagem de correio"
 
-#: 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 "Não é possível iniciar o componente de correio do Evolution."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Não é possível iniciar o componente de configuração de correio do Evolution."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Não é possível iniciar o componente de informação de pasta do 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 "Conectando ao servidor..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Não é possível registrar repositório com a shell."
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades para \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Propriedades"
 
-#: 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 "Não foi possível criar diretório temporário: %s"
@@ -11491,140 +11637,140 @@ msgstr "%d enviadas"
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar pasta _virtual a partir da mensagem"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _busca"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinatários"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discussão"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtro por _assunto"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtro por _remetente"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtro por _destinatários"
 
-#: 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 "Filtro por _lista de discussão"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: 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 "Res_ponder ao remetente"
 
-#: 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 "Responder a _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 "Responder a _todos"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: 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 "Concluída"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. 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 "Marcar como _lida"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: 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 _sem importância"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Des_fazer exclusão"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover para pasta..."
 
-#: 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 para pasta..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao catálogo de endereços"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar filtros"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Pasta virtual por lista de discussão"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtro por lista de discussão (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Pasta virtual por lista de discussão (%s)"
@@ -11697,20 +11843,20 @@ msgstr "Você não preencheu toda a informação exigida."
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_Máquina:"
 
-#: 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 "Nome do _usuário:"
 
-#: 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 "_Caminho:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Você não pode criar duas contas com o mesmo nome."
 
@@ -11727,14 +11873,14 @@ msgid "Really delete account?"
 msgstr "Excluir conta mesmo?"
 
 #: 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 "Desativar"
 
 #: 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 "Ativar"
 
@@ -11823,9 +11969,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 ""
 "Você está enviando uma mensagem em formato HTML, mas os seguintes "
 "destinatários não desejam correio em formato HTML:\n"
@@ -11869,7 +12016,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Você deve especificar destinatários para poder enviar esta mensagem."
 
-#: 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?"
@@ -11877,28 +12024,28 @@ msgstr ""
 "Não é possível abrir a pasta de rascunhos para esta conta.\n"
 "Você gostaria de usar a pasta de rascunhos padrão?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Em %a, %Y-%m-%d às %H:%M, %%s escreveu:"
 
-#: 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 mensagem(ns) para"
 
-#: 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 mensagem(ns) para"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Você tem certeza que deseja editar todas as %d mensagens?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11906,7 +12053,7 @@ msgstr ""
 "Você pode apenas editar mensagens salvas\n"
 "na pasta Rascunho."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11914,39 +12061,39 @@ msgstr ""
 "Você pode apenas reenviar mensagens\n"
 "na pasta Enviada."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Você tem certeza que deseja reenviar todas as %d mensagens?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Não existe mensagem selecionada"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Sobrescrever arquivo?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Salvar mensagem como..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Salvar mensagens como..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Exibir a próxima mensagem não lida"
 
-#: 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"
@@ -11959,7 +12106,7 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11968,65 +12115,65 @@ msgstr ""
 "Erro ao carregar informação do 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 "Obtendo mensagem %d de %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "Carta-US"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Falhou a impressão da mensagem"
 
-#: 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 ""
 "Você tem certeza que deseja abrir todas as %d mensagens em janela 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
 #, fuzzy
 msgid " [script]"
 msgstr "Sem descrição"
 
-#: 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 "Contato sem nome"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Enviar"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Adicionar critério"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Assinatura _HTML:"
@@ -12088,16 +12235,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas do Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr "Conta %d"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Verificando serviço"
 
-#: 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 ao servidor..."
 
@@ -12815,78 +12962,74 @@ msgstr "Não foi possível criar um contexto de envelope S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Não foi possível criar um contexto de decodificação S/MIME."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Salvar anexo"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Não foi possível criar diretório temporário: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Salvar anexo"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Ver embutido"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver embutido (via %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Esconder"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Visualizador externo"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Movendo mensagens"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Carregando conteúdo da mensagem"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tarefas _atrasadas:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %k:%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 "Abrir vínculo no navegador"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Copiar local do vínculo"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Salvar vínculo como (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
@@ -12895,111 +13038,112 @@ msgstr "Salvar imagem como..."
 msgid "Pinging %s"
 msgstr "Varrendo %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Não foi possível analisar mensagem MIME. Exibindo como fonte."
 
-#: 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 "Endereço inválido"
 
-#: 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 "Para"
 
-#: 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"
 "Agente de correio: "
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Esta mensagem está assinada digitalmente. Clique no cadeado para mais "
 "informações."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Não foi possível criar um contexto de verificação 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 "Esta mensagem está assinada digitalmente e é autêntica."
 
-#: 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 ""
 "Esta mensagem está assinada digitalmente mas não é possível estabelecer sua "
 "autenticidade."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para 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 "Apontador para arquivo local (%s) válido no site \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para dados remotos (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: 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 "Pastas locais"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando pasta"
 
-#: 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 +13152,22 @@ msgstr ""
 "Não é possível salvar metainfo; você provavelmente descobrirá que\n"
 "não pode mais abrir esta pasta: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Não é possível salvar metainfo de pasta para %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Não é possível excluir metainfo de pasta %s: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Alterando pasta \"%s\" para o formato \"%s\""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s não pode ser reconfigurada pois não é uma pasta 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 +13175,15 @@ msgstr ""
 "Se você não pode mais abrir esta caixa postal\n"
 "então você precisar repará-la manualmente."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Você não pode alterar o formato de pastas remotas."
-
-#: 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 "Você não pode alterar o formato de pastas remotas."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13285,21 +13424,21 @@ msgstr "Esperando..."
 msgid "User canceled operation."
 msgstr "O usuário cancelou a operação."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Lembrar esta senha pelo restante desta sessão"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Entre senha para %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Entre senha"
 
@@ -13308,11 +13447,11 @@ msgstr "Entre senha"
 msgid "Could not save signature file: %s"
 msgstr "Não foi possível salvar arquivo de assinatura."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Salvar assinatura"
 
-#: 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"
@@ -13322,11 +13461,11 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
-#: 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 "Nome:"
 
@@ -13366,7 +13505,7 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: 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 "Pastas virtuais"
 
@@ -13396,67 +13535,67 @@ msgstr "(Sem assunto)"
 msgid "%s - Message"
 msgstr "%s - Mensagem"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Não vista"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Várias mensagens não vistas"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Várias mensagens"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Mínima"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Mais baixa"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Mais alta"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Máxima"
 
-#: 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 "Hoje %k:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%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 "Gerando lista de mensagens"
 
@@ -13531,45 +13670,71 @@ msgstr "Responder a todos"
 msgid "Review"
 msgstr "Visualizar"
 
-#: 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 "Concluída"
+
+#: 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 "Limpar"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Prazo "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Marcada"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Varrendo pastas sob %s em \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Varrendo pastas no nível raiz em \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Assinando a pasta \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Cancelando assinatura da pasta \"%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 "Pasta"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Salvar na pasta..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Não foi selecionado um servidor"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Por favor selecione um servidor."
 
@@ -23478,12 +23643,12 @@ msgstr "%l:%M %d de %B"
 msgid "No description"
 msgstr "Sem descrição"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Resumo das mensagens"
 
-#: 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 "Pastas locais"
 
@@ -23493,23 +23658,23 @@ msgstr "Pastas locais"
 #. (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 "SBFN"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "\"Word of the Day\" do Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Citações do dia"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Adicionar uma fonte de notícias"
 
-#: 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 "Entre a URL da fonte notícias que você deseja adicionar"
 
@@ -23549,11 +23714,11 @@ msgstr "(Sem descrição)"
 msgid "My Weather"
 msgstr "Meu tempo"
 
-#: 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 "Tempo"
 
@@ -24880,6 +25045,11 @@ msgstr ""
 "Não é possível transferir pasta:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Abrir em %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25121,12 +25291,25 @@ msgid "Rename folder"
 msgstr "Renomear pasta"
 
 #: 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 "O nome de pasta especificado não é válido: %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ão é possível renomear pasta:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25135,12 +25318,12 @@ msgstr ""
 "Não é possível criar a pasta 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 "Criar _nova pasta..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Novo..."
 
@@ -25170,20 +25353,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor selecione a informação que você gostaria de 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"
-"Importador não está pronto.\n"
-"Esperando 5 segundos para tentar novamente."
-
-#: 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"
@@ -25192,22 +25362,22 @@ msgstr ""
 "Importando %s\n"
 "Importando item %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Selecionar pasta"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Arquivo %s não 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 "Erro do 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"
@@ -25216,11 +25386,11 @@ msgstr ""
 "Não existe importador capaz de tratar\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"
@@ -25229,17 +25399,17 @@ msgstr ""
 "Importando %s.\n"
 "Iniciando %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao carregar %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25248,31 +25418,31 @@ msgstr ""
 "Importando %s\n"
 "Importando item 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 "Nome do arquivo:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Tipo do arquivo:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Importar dados e configurações de programas antigos"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importar um único arquivo"
 
-#: 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"
@@ -25280,24 +25450,24 @@ msgstr ""
 "Por favor aguarde...\n"
 "Procurando configurações 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 "Iniciando 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 "Selecionar pasta"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Selecionar uma pasta destino para onde importar estes dados"
 
-#: 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"
 
@@ -25325,32 +25495,32 @@ msgstr "Sincronizando pasta"
 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 "Abrindo pasta %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 "Abrindo pasta %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 em %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 "Não foi possível renomear pasta: %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 ""
@@ -25393,44 +25563,44 @@ msgstr "O nome da pasta não pode conter barras."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' são nomes de pastas reservados."
 
-#: 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 não foi encontrado em seu $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 não pôde ser executado."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Sobre o Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Ir para a pasta..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Selecione a pasta que você quer abrir"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Criar um novo atalho"
 
-#: 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 "Selecione a pasta para a qual você quer que o atalho aponte:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "_Trabalhar 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 "_Trabalhar 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 "Trabalhar desconectado"
 
@@ -25438,27 +25608,27 @@ msgstr "Trabalhar desconectado"
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta exibida)"
 
-#: 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 "(Nenhum)"
 
-#: 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 ""
 "O Ximian Evolution está atualmente conectado. Clique neste botão para "
 "trabalhar desconectado."
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "O Ximian Evolution está em preocesso de se desconectar."
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25477,12 +25647,12 @@ msgstr ""
 "O erro do sistema de ativação é:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Não é possível preparar repositório 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"
@@ -25493,19 +25663,19 @@ msgstr ""
 "terminou inesperadamente. Você terá que sair do Evolution e reiniciá-lo\n"
 "para poder acessar os seus dados novamente."
 
-#: shell/e-shell.c: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 "Não é possível registrar no OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Não foi localizado o banco de dados de configuração"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -25645,59 +25815,63 @@ msgstr "Atalhos"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Sem erro"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Já existe uma pasta com o mesmo nome"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "O tipo de pasta especificado não é válido"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Não há espaço suficiente para criar a pasta"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "A pasta não está vazia"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "A pasta especificada não foi achada"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Função não implementada neste repositório"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operação não suportada"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado não é suportado neste repositório"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "A pasta especificada não pode ser modificada ou removida"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 "Não é possível transformar uma pasta em filha de um de seus descendentes"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Não é possível criar uma pasta com este nome"
 
+#: 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 (...)"
@@ -25912,9 +26086,10 @@ msgstr ""
 "Por favor clique o botão \"Próximo\" 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 ""
@@ -25933,26 +26108,22 @@ msgid "Evolution Import Assistant"
 msgstr "Assistente de importação do Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Assistente importador do Evolution"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Importar arquivo (passo 3 de 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Tipo do importador (passo 1 de 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Selecionar importadores (passo 2 de 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Selecionar um arquivo (passo 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"
@@ -26169,10 +26340,10 @@ msgstr "o instante atual"
 #: 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ções"
 
@@ -26291,7 +26462,7 @@ msgid "Print this item"
 msgstr "Imprime este item"
 
 #: 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 "Salvar"
 
@@ -26318,7 +26489,7 @@ msgstr "Salvar este item para 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 "_Arquivo"
 
@@ -26400,7 +26571,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Agendar uma reunião para este item"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Personalizar Meu Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26453,29 +26625,30 @@ msgid "Post a message to a Public folder"
 msgstr "Salvando mensagem na pasta"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Assinar pastas..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Exibir janela de visualização de mensagem"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Assinar ou cancelar a assinatura de pastas em servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "Editor de pastas _virtuais..."
 
-#: 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 "_Painel de visualização"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_Assinar pastas..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Alterar as propriedades desta pasta"
@@ -26572,7 +26745,7 @@ msgstr "Lista de mensagens encadeadas"
 msgid "_Expunge"
 msgstr "E_xcluir permanentemente"
 
-#: 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 "_Pasta"
 
@@ -26889,7 +27062,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Buscar por texto no corpo da mensagem exibida"
 
 #: 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 a página para a sua impressora atual"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -27003,7 +27177,7 @@ msgstr "Citado"
 msgid "_Resend..."
 msgstr "_Renomear..."
 
-#: 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 "_Ferramentas"
 
@@ -27018,12 +27192,12 @@ msgstr "Fechar esta janela"
 #: 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 "_Fechar"
 
 #: 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 "_Ver"
 
@@ -27197,7 +27371,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Salvar o item e fechar a caixa de diálogo"
 
-#: 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 "Aj_uda"
 
@@ -27366,7 +27540,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Criar _nova pasta..."
 
 #: 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
@@ -27383,114 +27557,133 @@ msgid "Pi_lot Settings..."
 msgstr "Configurações do _pilot..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Configurações do _pilot..."
+
+#: 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 "Enviar / receber"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar mensagens na fila de saída e recuperar novas mensagens"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Configuração de correio"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuração de correio"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Exibir informação sobre o Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Enviar relatório de erro"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Enviar relatório de _erro"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar relatório de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Alternar"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Alternar a exibição da barra de pastas"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Alternar a exibição da barra de atalhos"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Alternar se estamos trabalhando desconectados."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Ver a pasta selecionada"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ do Ximian Evolution"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "_Sobre o 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 pastas"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Pasta"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: 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 "_Novo"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "_Propriedades..."
+msgid "_Remove Other User's Folder"
+msgstr "Criar _nova pasta..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Enviar / receber"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Configurações"
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Barra de atalhos"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Atalho"
@@ -27733,11 +27926,11 @@ msgstr "Codificação de caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Editor de buscas"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Salvar busca"
 
@@ -27818,5 +28011,48 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 
 #, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr " _Remover"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Procurando novas mensagens"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "A pasta não está vazia"
+
+#~ 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 ""
+#~ "Você esqueceu de escolher uma pasta.\n"
+#~ "Por favor volte e especifique uma pasta válida para onde entregar correio."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s não pode ser reconfigurada pois não é uma pasta local"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importando %s\n"
+#~ "Importador não está pronto.\n"
+#~ "Esperando 5 segundos para tentar novamente."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Assistente importador do Evolution"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "_Propriedades..."
+
+#, fuzzy
 #~ msgid "_Server:"
 #~ msgstr "Nome do _servidor:"
diff --git a/po/ro.po b/po/ro.po
index e48d5cbafd..d3f75cd564 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.15\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2001-09-12 16:59+0800\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Rom�n� <ro@li.org>\n"
@@ -322,11 +322,17 @@ msgstr "Nume de familie"
 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 "Contact schimbat:"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Carduri V multiple"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "Card V pentru %s"
@@ -337,47 +343,47 @@ msgstr "Card V pentru %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 "Nu pot ini�ializa 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 "Caut..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "�ncarc..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Conectare la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Adaug� card la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "�terge card de la serverul 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 "Modificare card pentru serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Primesc rezultatele c�ut�rii LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Eroare �tergere card"
@@ -396,13 +402,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook ne�nc�rcat\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 "Nu pot porni serverul 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 "Nu pot porni wombat"
@@ -471,10 +477,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Procesator pentru controlul mostr� agend�"
 
 #: 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 "Contacte"
@@ -491,29 +497,39 @@ msgstr "Server LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Contacte"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Dosar con�in�nd informa�ie de contact"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Contact nou"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Creaz� contact nou"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "List� contacte nou�"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Creaz� list� nou� de contacte"
@@ -562,7 +578,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
 #: 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 "Nu pot ini�ializa gnome-vfs"
 
@@ -570,11 +586,11 @@ msgstr "Nu pot ini�ializa gnome-vfs"
 msgid "Other Contacts"
 msgstr "Alte contacte"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Nu pot deschide agenda"
 
-#: 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 ""
 "Nu pot deschide aceast� agend�. V� rog verifica�i dac� exist� calea\n"
 "�i daca ave�i drepturi de acces."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -593,7 +609,7 @@ msgstr ""
 "c� a�i introdus URI incorect, sau serverul LDAP\n"
 "e c�zut"
 
-#: 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 ""
 "programul din sursele CVS dup� ce desc�rca�i OpenLDAP urm�nd\n"
 "leg�tura urm�toare.\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,39 +632,52 @@ msgstr ""
 "c� a�i introdus URI incorect, sau serverul LDAP\n"
 "e c�zut"
 
-#: 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 ""
+"Autentificare la serverul IMAP e�uat�.\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 "Introduce�i parola pentru %s"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "se termin� cu"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "se termin� cu"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "Categorii"
 
 #. 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 "Orice c�mp con�ine"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Avansat..."
 
-#: 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"
@@ -656,7 +685,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"
@@ -664,26 +693,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 "Categorie:"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "URI pe care navigatorul dosarelor �l va afi�a"
 
@@ -752,53 +781,53 @@ msgstr "Verific tipurile suportate"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Op�iuni"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "�te_rge"
-
-#: 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
 #, 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 "�te_rge"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Op�iuni"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -935,51 +964,57 @@ msgstr "Unu"
 
 #: 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 "Implicit"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Implicit"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Scopul c�ut�rii:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h: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 "Caut..."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Selecteaz� tot"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "�terse"
 
-#: 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"
@@ -990,7 +1025,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"
@@ -999,48 +1034,48 @@ 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 "Informa�ie surs�"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Conectare la 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
 #, fuzzy
 msgid "Sub"
 msgstr "Du"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Stochez c�utarea ca dosar V"
 
-#: 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"
@@ -1048,7 +1083,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"
@@ -1057,7 +1092,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"
@@ -1065,7 +1100,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"
@@ -1075,7 +1110,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"
@@ -1085,34 +1120,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"
@@ -1120,11 +1155,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"
@@ -1133,25 +1168,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 "_Aceasta este adresa de expediere"
 
-#: 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
@@ -1159,49 +1194,49 @@ msgstr ""
 msgid "_Add"
 msgstr "_Adaug�"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "Adaug� ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Adaug� ac�iune"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Adaug� ac�iune"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Alarme"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "�terge tot"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "Afi�eaz�"
 
-#: 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
@@ -1211,104 +1246,104 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editeaz�"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Editeaz� �nt�lnire"
 
-#: 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 "_Op�iuni"
 
-#: 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 "Implicit"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "Domeniu c�utare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Server name:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durata de sfor�ire (minute)"
 
-#: 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 "editor-lista-contact"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Deconectare de la %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 "Caut..."
@@ -1323,8 +1358,8 @@ msgstr "Procesator interfa�a de selectare nume a agendei"
 
 #. 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 ""
 msgid "Unnamed Contact"
 msgstr "Contact schimbat:"
 
-#: 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 "G�se�te un contact"
@@ -1441,7 +1476,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 "Detalii"
 
@@ -1504,13 +1539,13 @@ msgstr "Dori�i sa primi�i mail-uri _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c: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 "_�terge"
 
@@ -1540,1099 +1575,1099 @@ msgstr "Calendar URI"
 msgid "_Web page address:"
 msgstr "Adresa paginii de 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 "(Mesaj f�r� titlu)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 #, fuzzy
 msgid "Afghanistan"
 msgstr "Asistent"
 
-#: 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 "Automat"
 
-#: 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 "Orientare"
 
-#: 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 "August"
 
-#: 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 "ani"
 
-#: 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 "M�rime"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 #, fuzzy
 msgid "Benin"
 msgstr "Trimit"
 
-#: 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 "Grindin�"
 
-#: 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 "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 ""
 
-#: 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 "Scaun"
 
-#: 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 "Chinez"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 #, fuzzy
 msgid "China"
 msgstr "Chinez"
 
-#: 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 "Culori"
 
-#: 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 "Copiez"
 
-#: 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 "Finlanda"
 
-#: 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 "Renun��"
 
-#: 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
 #, fuzzy
 msgid "Greece"
 msgstr "Grec"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #, fuzzy
 msgid "Greenland"
 msgstr "Finlanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #, fuzzy
 msgid "Grenada"
 msgstr "Canada"
 
-#: 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 "Grindin�"
 
-#: 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 "ore"
 
-#: 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 "Duminic�"
 
-#: 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
 #, fuzzy
 msgid "Ireland"
 msgstr "Corean"
 
-#: 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
 #, fuzzy
 msgid "Japan"
 msgstr "Japonez"
 
-#: 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
 #, fuzzy
 msgid "Jordan"
 msgstr "Corean"
 
-#: 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 "Cea mai sc�zut�"
 
-#: 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 "Cea mai sc�zut�"
 
-#: 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
 #, fuzzy
 msgid "Lithuania"
 msgstr "Grindin� u�oar�"
 
-#: 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 "Martie"
 
-#: 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 "Mail"
 
-#: 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 "Mail"
 
-#: 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 "Mail"
 
-#: 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
 #, fuzzy
 msgid "Mauritius"
 msgstr "Margini"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #, fuzzy
 msgid "Mayotte"
 msgstr "Mai"
 
-#: 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 "Luni"
 
-#: 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 "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 #, fuzzy
 msgid "Myanmar"
 msgstr "Manager"
 
-#: 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 "Mail nou"
 
-#: 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 "Selec_teaz� �nl�n�uirea"
 
-#: 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 "Contact nou"
 
-#: 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 "Mail nou"
 
-#: 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 "Mai mare"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 #, fuzzy
 msgid "Nigeria"
 msgstr "Mai mare"
 
-#: 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 "Acum"
 
-#: 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 "Lipe�te"
 
-#: 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 "Canada"
 
-#: 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 "H�rtie"
 
-#: 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 "Finlanda"
 
-#: 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 "Portret"
 
-#: 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 "dup�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 #, fuzzy
 msgid "Reunion"
 msgstr "Regiuni"
 
-#: 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 "Canada"
 
-#: 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 "Fum"
 
-#: 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 "Program"
 
-#: 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 "Ploaie"
 
-#: 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 "Dum"
 
-#: 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 "Porecl�"
 
-#: 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 "Finlanda"
 
-#: 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 "V�zut"
 
-#: 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 "Ploaie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 #, fuzzy
 msgid "Tajikistan"
 msgstr "Lista de sarcini"
 
-#: 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 "Finlanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 #, fuzzy
 msgid "Togo"
 msgstr "La"
 
-#: 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 "Ast�zi"
 
-#: 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 "Mar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 #, fuzzy
 msgid "Turkmenistan"
 msgstr "Turc"
 
-#: 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 "Canada"
 
-#: 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
 #, fuzzy
 msgid "Ukraine"
 msgstr "Ucrainean"
 
-#: 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 "Selec�ie nume"
 
-#: 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
 #, fuzzy
 msgid "Western Sahara"
 msgstr "Europa de vest"
 
-#: 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 "V�zut"
 
-#: 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 ""
 
@@ -2670,20 +2705,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nu pot �terge dosarul sumar al fi�ierelor `%s': %s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "Contact Ad�ugare-Rapid�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Editare complet�"
 
-#: 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 "Nume 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"
 
@@ -2704,6 +2739,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 "Suprascrie�i fi�ierul?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresa _2"
@@ -2835,7 +2883,7 @@ msgstr "editor-lista-contact"
 msgid "Contact List Editor"
 msgstr "Editor lista de contacte"
 
-#: 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 "Salveaz� ca �i card V"
@@ -2887,7 +2935,7 @@ msgstr ""
 "�n acest dosar. Dori�i s� continua�i �n acest caz?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "C�utare avansat�"
 
@@ -2896,27 +2944,27 @@ msgstr "C�utare avansat�"
 msgid "Search"
 msgstr "Caut�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 #, fuzzy
 msgid "No cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 #, fuzzy
 msgid "1 card"
 msgstr "Tip�re�te calendar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr "%d secunde"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Eroare la start %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"
@@ -2928,10 +2976,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 "Eroare necunoscut�"
 
@@ -2939,7 +2987,7 @@ msgstr "Eroare necunoscut�"
 msgid "Repository offline"
 msgstr "Depozitare 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 "Acces interzis"
@@ -2960,8 +3008,8 @@ msgstr "Protocol nesuportat"
 #: 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 "Revocat"
 
@@ -3012,7 +3060,7 @@ msgstr "Eroare la �tergerea listei"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Eroare �tergere card"
 
@@ -3029,9 +3077,8 @@ msgstr "Afi�eaz�"
 #: 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
@@ -3121,7 +3168,7 @@ msgstr "Agend�"
 
 #: 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 "Salveaz� ca �i card V"
@@ -3209,7 +3256,7 @@ msgstr "Copiaz�"
 msgid "Paste"
 msgstr "Lipe�te"
 
-#: 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
@@ -3217,8 +3264,8 @@ msgstr "Lipe�te"
 msgid "Delete"
 msgstr "�terg"
 
-#: 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 "Vizualizarea _curent�"
@@ -3227,7 +3274,7 @@ msgstr "Vizualizarea _curent�"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c: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 ""
 
@@ -3235,11 +3282,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"
@@ -3379,7 +3426,7 @@ msgid "Include:"
 msgstr "Include:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Peisaj"
 
@@ -3404,7 +3451,7 @@ msgid "Options"
 msgstr "Op�iuni"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientare"
 
@@ -3427,7 +3474,7 @@ msgstr "Sursa hirtie"
 
 #. 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"
 
@@ -3491,20 +3538,20 @@ msgstr "_Editeaz� �nt�lnire"
 
 #: 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 "Ridicat"
 
 #: 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 "Sc�zut"
 
@@ -3515,13 +3562,17 @@ msgstr "Sc�zut"
 msgid "Undefined"
 msgstr "Nedefinit"
 
-#: 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 "Eroare in timpul comunic�rii cu serverul calendar"
 
-#: 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 "Nu pot citi pilotul blocului aplica�ie calendar"
 
@@ -3639,11 +3690,11 @@ msgstr "Durata de sfor�ire (minute)"
 msgid "_Edit appointment"
 msgstr "_Editeaz� �nt�lnire"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Nu e disponibil� o descriere."
 
-#: 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"
@@ -3651,13 +3702,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 "Avertisment"
 
-#: 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 "
@@ -3668,16 +3719,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 "Nu m� �ntreba din nou"
 
-#: 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 "Nu pot ini�ializa 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 "Nu pot crea procesatorul servicului de notificare alarm�"
 
@@ -3729,7 +3780,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 "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si OAF"
@@ -3807,9 +3858,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
@@ -3826,13 +3877,13 @@ msgid "Assigned"
 msgstr "Alocat"
 
 #: 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 "Da"
 
 #: 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 "Nu"
 
@@ -3852,83 +3903,102 @@ msgstr "Afi�are s�ptam�n�"
 msgid "Month View"
 msgstr "Afi�are lun�"
 
-#: 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"
 
-#: 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 "Calendar URI"
+
+#: 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 "Sarcini"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Dosar V �n lista de mail"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Tip�re�te calendar"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Dosar V �n lista de mail"
+
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Creaz� o �nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Aceasta e o cerere de �nt�lnire."
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Sarcin� nou�"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "Sarcin�"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Creaz� o sarcin� nou�"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Creaz� o �nt�lnire nou�"
@@ -3971,27 +4041,27 @@ msgid "Alarm Repeat"
 msgstr "Repetare alarm�"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid ""
+"Evolution does not yet support email notification for reminders.  You will "
+"not be able to edit the options for this reminder."
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Mesaj de afi�at"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Red� sunetul:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Repet� alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Ruleaz� programul:"
 
-#: 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 "Cu argumentele:"
@@ -4015,111 +4085,111 @@ msgstr "ore"
 msgid "minutes"
 msgstr "minute"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d zile"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 zi"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d s�pt�m�ni"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 s�pt�m�n�"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d ore"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 or�"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minute"
 
-#: 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 secunde"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 secund�"
 
-#: 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 "Red� un sunet"
 
-#: 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 "Afi�eaz� un mesaj"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Trimite un 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 "Ruleaz� un program"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 #, fuzzy
 msgid "Unknown action to be performed"
 msgstr "Furtun� necunoscut�"
 
-#: 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 "�nainte de �nceperea �nt�lnirii"
 
-#: 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 "�nainte de �nceperea �nt�lnirii"
 
-#: 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 "�nainte de �nceperea �nt�lnirii"
 
-#: 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 "�nainte de �nceperea �nt�lnirii"
 
-#: 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 "dup� sf�r�itul �nt�lnirii"
 
-#: 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 "dup� sf�r�itul �nt�lnirii"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s server %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 ""
@@ -4140,7 +4210,7 @@ msgstr "Memorator"
 
 #: 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 "Cuprins:"
 
@@ -4225,7 +4295,7 @@ msgid "Days"
 msgstr "Zi"
 
 #: 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 "Vineri"
 
@@ -4240,7 +4310,7 @@ msgid "Minutes"
 msgstr "minute"
 
 #: 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 "Luni"
 
@@ -4250,7 +4320,7 @@ msgid "S_un"
 msgstr "Dum"
 
 #: 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�mb�t�"
 
@@ -4264,7 +4334,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Arat� num�rul de s�pt�m�ni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Duminic�"
 
@@ -4284,7 +4354,7 @@ msgid "Task List"
 msgstr "Lista de sarcini"
 
 #: 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 "Joi"
 
@@ -4302,7 +4372,7 @@ msgid "Time format:"
 msgstr "Format timp:"
 
 #: 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 "Mar�i"
 
@@ -4311,7 +4381,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 "Miercuri"
 
@@ -4548,8 +4618,8 @@ msgid "No summary"
 msgstr "Nu exist� rezumat"
 
 #: 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 "Salveaz� ca..."
 
@@ -4621,28 +4691,28 @@ msgstr "Delegat la:"
 msgid "Enter Delegate"
 msgstr "�terse"
 
-#: 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 "�nt�lnire"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Reaminte�te"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Revenire"
 
-#: 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 "Progra_mare �nt�lniri"
 
-#: 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 "�nt�lnire"
 
@@ -4716,20 +4786,20 @@ msgstr "Ora d_e sf�r�it"
 msgid "_Start time:"
 msgstr "Ora de �nceput"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Un organizator trebuie setat."
 
-#: 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 "_Delegat la..."
 
@@ -4770,7 +4840,7 @@ msgid "Member"
 msgstr "Membru"
 
 #: 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"
@@ -4782,7 +4852,7 @@ msgstr "Rol"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stare"
@@ -4859,48 +4929,48 @@ msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Aceast� �nt�lnire con�ine reveniri pe care Evolution nu le poate edita."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "Cea��"
 
-#: 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 "secund�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Alte"
 
-#: 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 "Cea��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Alt 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 "ziua"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "apari�ii"
 
@@ -5004,7 +5074,7 @@ msgstr "�nt�lnire �ncheiat�:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c: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 "Selectez o ac�iune"
@@ -5014,7 +5084,7 @@ msgid "Progress"
 msgstr "�n desf�urare"
 
 #: 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:"
 
@@ -5026,18 +5096,18 @@ msgstr "_Prioritate:"
 msgid "_Status:"
 msgstr "_Stare"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "De baz�"
 
-#: 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 "Alocat"
 
-#: 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:"
@@ -5107,13 +5177,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 "�terge contactele selectate"
 
-#: 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 "Deschide"
@@ -5123,30 +5193,30 @@ msgstr "Deschide"
 msgid "_Save as..."
 msgstr "Salveaz� ca..."
 
-#: 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 "_Tip�re�te..."
 
-#: 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 "Dec_upeaz�"
 
-#: 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 "_Copiaz�"
 
-#: 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"
@@ -5177,12 +5247,12 @@ msgstr "Marcheaz� sarcinile ca terminate"
 msgid "_Delete Selected Tasks"
 msgstr "�terge sarcinile selectate"
 
-#: 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"
@@ -5192,8 +5262,8 @@ msgstr "Clic aici s� ad�uga�i o sarcin�"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c: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 "Terminat"
 
@@ -5222,7 +5292,7 @@ msgid "Start Date"
 msgstr "Data �nceput"
 
 #: 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 "Rezumat"
@@ -5289,493 +5359,499 @@ 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 "�nt�lnire nou�"
 
-#: 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 "Eveniment zilnic nou"
 
-#: 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 "�nt�lnire"
 
-#: 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 "Sarcin� nou�"
 
-#: 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 "Tip�re�te"
 
-#: 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 "Mergi la _ziua"
 
-#: 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 "Mergi la 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 "Aceasta e informa�ie liber-ocupat."
 
-#: 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 "Configurare mail"
 
-#: 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 "Configurare mail"
 
-#: 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 "_Salveaz� ca..."
 
-#: 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 "Progra_mare �nt�lniri"
 
-#: 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 "�nainteaz� ca �i _calendar 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
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "F� aceast� apari�ie mutabil�"
 
-#: 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 "�terge aceast� apari�ie"
 
-#: 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 "�terge toate apari�iile"
 
-#: 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 "Eroare execu�ie filtru: %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 "Ora de sf�r�it a �nt�lnirii:"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Terminat "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descriere:"
 
-#: 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 "informa�ie calendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Calendar"
 
-#: 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 "Eroare necunoscut�"
 
 #. 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 "_Ac�iune"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_Stare"
 
-#: 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 " 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
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Inten�ie "
 
-#: 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 " Refuz� "
 
-#: 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 "Necunoscut"
 
-#: 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 "Selectez o ac�iune"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 #, fuzzy
 msgid "Update"
 msgstr "a fost dup�"
 
-#: 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 " Accept� "
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Inten�ie "
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 #, fuzzy
 msgid "Decline"
 msgstr " Refuz� "
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informa�ie surs�"
 
-#: 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 "Informa�ie"
 
-#: 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 "Renun��"
 
-#: 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 "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Informa�ie op�ional�"
 
-#: 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 "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "�nt�lnire"
 
-#: 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 "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: 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 "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Cerere de �nt�lnire (FIXME)"
 
-#: 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 "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "�nt�lnire"
 
-#: 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 "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Selectez o ac�iune"
 
-#: 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 "G�se�te �n mesaj"
 
-#: 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 "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Task Information"
 msgstr "Informa�ie"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Panou sarcini"
 
-#: 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 "Aceasta e o cerere pentru ultima informa�ie despre sarcin�."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 #, fuzzy
 msgid "Task Update"
 msgstr "a fost dup�"
 
-#: 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 "Aceasta e o cerere pentru ultima informa�ie despre sarcin�."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Ce_rere task (FIXME)"
 
-#: 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 "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 #, fuzzy
 msgid "Task Reply"
 msgstr "R�spunde"
 
-#: 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 "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Aceasta e o anulare a unei sarcini"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Mesaj calendar"
 
-#: 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 "Aceasta e informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informa�ie surs�"
 
-#: 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 "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL liber-ocupat"
 
-#: 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 "Acesta e un r�spuns la o cerere liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Tip�re�te mesaj"
 
-#: 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 "Dosarul pare a fi deteriorat irecuperabil."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Mesajul con�ine numai cererile nesuportate."
 
-#: 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
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "S-a produs o eroare la desc�rcarea sursei de �tiri</dt>"
 
-#: calendar/gui/e-itip-control.c: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 buddy nu poate fi rulat."
 
-#: 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 "Nu pot deschide dosarul �n `%s'"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Nu pot �nc�rca cursorul\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 "Nu pot deschide dosarul �n `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: 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 "Date trimise"
 
-#: 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 "Alege dosar"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Alege dosar"
@@ -5822,7 +5898,7 @@ msgstr "dat� �nceput"
 msgid "Chair Persons"
 msgstr "Telefon ma�in�"
 
-#: 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 "Participant necesar"
@@ -5838,54 +5914,54 @@ msgid "Resources"
 msgstr "Surs�"
 
 #: 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 "Nume grup:"
 
 #: 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 "Surs�"
 
 #: 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 "Scaun"
 
 #: 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 necesar"
 
 #: 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 op�ional"
 
 #: 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 "Neparticipant"
 
 #: 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 "Tentativ�"
 
 #: 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 "�terse"
@@ -5977,43 +6053,50 @@ msgstr "Ora de �nceput a �nt�lnirii:"
 msgid "Meeting _end time:"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: 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 "Deschid rezerva %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 "Nu pot inc�rca sarcinile �n `%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 necesar� pentru a �nc�rca `%s' nesuportat�"
 
-#: 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 "Nu pot deschide dosarul �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 "Eroare la start %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data terminare"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "�terge contactele selectate"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "Distrug dosarul"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�nt�lnire nou�..."
@@ -6028,7 +6111,13 @@ msgstr "Nu pot deschide dosarul �n `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda cerut� pentru deshiderea `%s' nu e 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 "Alarme"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6036,7 +6125,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"
@@ -6044,12 +6133,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 "Deschide calendar"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Deschid dosarul %s"
@@ -6111,54 +6200,64 @@ msgstr "Octombrie"
 msgid "September"
 msgstr "Septembrie"
 
-#: 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 "Un organizator trebuie setat."
 
-#: 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
 #, fuzzy
 msgid "Event information"
 msgstr "informa�ie calendar"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "Informa�ie"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "Informa�ie op�ional�"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informa�ie surs�"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 msgid "Calendar information"
 msgstr "informa�ie calendar"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "a fost dup�"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Re�mprosp�teaz� 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
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Informa�ie surs�"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "informa�ie calendar"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6402,7 +6501,7 @@ msgid "Print Calendar"
 msgstr "Tip�re�te calendar"
 
 #: 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 "Previzualizeaz� tip�rirea"
@@ -6425,7 +6524,7 @@ msgstr "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si OAF"
 msgid "The URI of the tasks folder to display"
 msgstr "De afi�at URI pentru dosarul sarcini"
 
-#: 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"
@@ -6433,13 +6532,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 "Nu m� �ntreba din nou"
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tip�re�te calendar"
@@ -6512,17 +6611,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Nu m� pot conecta la serverul: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Reaminte�te"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mesaj calendar"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6531,117 +6630,122 @@ msgstr ""
 "Evolution a g�sit fi�iere de mail Pine.\n"
 "Dori�i s� le importa�i �n Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Deschide calendar"
 
-#: 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
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: 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
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: 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 "Alt� eroare"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8263,82 +8367,82 @@ msgstr "Creez dosar nou"
 msgid "You must be working online to complete this operation"
 msgstr "Pentru aceast� opera�ie trebuie s� lucra�i online"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Sincronizare foldere"
 
-#: 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 "Eroare parsare filtru: %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 "Eroare execu�ie filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Nu pot deschide dosarul spool"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Nu pot procesa dosarul spool"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Nu pot deschide mesajul"
 
-#: 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 "E�uare la mesajul %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 "Sincronizare dosar"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "E�uare la mesajul %d din %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Con�inut invalid al mesajului"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Con�inut invalid al mesajului"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-filter-search.c:547
+#: camel/camel-filter-search.c:550
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-filter-search.c: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 "Eroare execu�ie filtru c�utare: %s: %s"
@@ -8389,12 +8493,12 @@ msgstr ""
 "Eroare executare expresia c�utare: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copiez mesaje"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Copiez mesajele �n %s"
@@ -8716,7 +8820,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 "R�spuns de la server de autentificare e�uat�."
 
@@ -8775,52 +8879,52 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilarea expresiei regulate e�uat�: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necesit� o component� nume utilizator"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necesit� o component� gazd�"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necesit� o component� de cale"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Rezolv: %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 "E�ec la c�utarea numelui: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "E�ec la c�utarea gazdei: %s: gazd� neg�sit�"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "E�ec la c�utarea gazdei: %s: motiv necunoscut"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Rezolv: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "E�ec la c�utarea gazdei: %s: gazd� neg�sit�"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "E�ec la c�utarea gazdei: %s: motiv necunoscut"
@@ -9021,7 +9125,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"
@@ -9030,11 +9134,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 ""
 
@@ -9056,7 +9160,7 @@ msgstr ""
 "Dori�i s� accepta�i oricum?"
 
 #. 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"
@@ -9111,69 +9215,77 @@ msgstr "Nu pot crea dosarul blocat la %s: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %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 "Opera�ia anulat�"
 
-#: 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 "Server deconectat nea�teptat"
 
-#: 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�spuns nea�teptat de la serverul IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "R�spuns nea�teptat de la serverul 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 "Comanda IMAP e�uat�: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "R�spunsul serverului terminat prea repede."
 
-#: 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 "R�spunsul serverului IMAP nu con�ine informa�ia %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�spunsul serverului IMAP nea�teptat 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 "Nu pot crea directorul %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 "Nu pot �nc�rca sumarul pentru %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 "Dosarul a fost distrus �i recreat pe server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Salvez mesajele"
 
-#: 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 "E�ec la decodarea mesajului."
 
-#: 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
@@ -9189,29 +9301,24 @@ msgstr ""
 "Nu pot lua mesajul: %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 "Nu exist� mesaj"
 
-#: 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 "Mesajul nu este disponibil �n mod curent"
 
-#: 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 "Salvez mesajele"
-
-#: 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 "Nu pot g�si corpul mesajului �n r�spunsul FETCH."
 
@@ -9228,6 +9335,11 @@ msgstr "Nu pot deschide directorul cache: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "E�ec la decodarea mesajului."
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "E�ec la decodarea mesajului."
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Verific mailurile noi"
@@ -9276,77 +9388,72 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aceast� op�iune v� va conecta la serverul IMAP folosind o parol� �n clar "
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Server 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 serviciu pentru %s �n %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 "Conexiune anulat�"
 
-#: 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 "Nu m� pot conecta la %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 ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea numelui utilizator: %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 "Opera�ie nesuportat�"
 
-#: 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 "E�ec la autentificare."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Dosarul `%s' nu exist�."
-
-#: 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 "Serverul IMAP %s nu suport� tipul cerut de autentificare %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 "Tip de autentificare nesuportat %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 "%sV� rog intoduce�i parola IMAP pentru %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 "Nu a�i introdus o parol�."
 
-#: 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"
@@ -9357,24 +9464,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 "Nu exist� dosarul %s"
 
-#: 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 "Eroare necunoscut�: %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 ""
 
@@ -9455,8 +9562,8 @@ msgid ""
 msgstr "Pentru stocarea mail-urilor locale �n directoare spool Unix"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c: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 "Stocarea root %s nu e o cale absolut�"
@@ -9468,7 +9575,7 @@ msgstr "Stocarea root %s nu e director obi�nuit"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
@@ -9482,32 +9589,32 @@ msgstr "Stoc�rile locale nu au un inbox"
 msgid "Local mail file %s"
 msgstr "Fi�ier mail-uri locale %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 "Nu pot redenumi dosarul %s �n %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 "Nu pot redenumi dosarul: %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 "Nu pot �terge dosarul sumar al fi�ierelor `%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 "Nu pot �terge dosarul index al fi�ierelor `%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 "Nu pot �nc�rca sumarul pentru %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 "Nu pot ad�uga mesajul la sumar: motiv necunoscut"
 
@@ -9528,6 +9635,7 @@ msgstr "Con�inut invalid al mesajului"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9539,12 +9647,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 "Dosarul `%s' nu exist�."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9570,7 +9680,8 @@ msgid "not a maildir directory"
 msgstr "nu e director maildir"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c: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 "Nu pot scana dosarul `%s': %s"
@@ -9601,7 +9712,7 @@ msgid "Storing folder"
 msgstr "Sincronizare dosar"
 
 #: 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 "Nu pot crea dosarul blocat la %s: %s"
@@ -9776,40 +9887,45 @@ msgstr "`%s' nu e un director"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nu pot deschide calea c�tre directorul MH: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Dosarele spool nu pot fi redenumite"
 
-#: 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 "Stocarea root %s nu e director obi�nuit"
 
-#: 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 "Dosarul `%s'/%s nu exist�."
 
-#: 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' nu e un fi�ier obi�nuit."
+
+#: 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 "Fi�ier 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 "Dosarele spool nu pot fi redenumite"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Dosarele spool nu pot fi redenumite"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Dosarele spool nu pot fi �terse"
 
@@ -9904,51 +10020,51 @@ msgstr "Renun��"
 msgid "Operation failed: %s"
 msgstr "Opera�ia anulat�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Primesc sumarul 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 "Opera�ia anulat�"
 
-#: 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 "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Decupeaz� mesajele selectate"
 
-#: 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 "Nici un mesaj cu uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Primesc mesajul 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 ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipita�ie necunoscut�"
@@ -10224,45 +10340,45 @@ msgstr "E�uare temporar� a autentific�rii"
 msgid "Authentication required"
 msgstr "Necesit� autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "R�spuns de eroare 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 ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea numelui utilizator: %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 "Mesajul nu pare a fi formatat corespunz�tor."
 
-#: 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 "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "R�spuns de eroare 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 "Serverul SMTP %s nu suport� tipul cerut de autentificare %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 "%sIntroduce�i v� rog parola SMTP pentru %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"
@@ -10273,92 +10389,92 @@ 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 "Server 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 mail livrat prin %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 "Nu pot trimite mesajul: adresa expeditorului invalid�."
 
-#: 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 "Trimit mesaj"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: 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 "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "�nt�lnire"
 
-#: 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 "Timp expirat pentru cererea RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Eroare la crearea obiectului de autentificare 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 "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "E�ec la cererea 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 "R�spuns de la server: autentificare e�uat�.\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 "Comanda MAIL FROM a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "R�spuns de eroare la comanda MAIL FROM: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Comanda RCPT TO a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c: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 "Comanda DATA a expirat: %s: mailul nu a fost trimis"
@@ -10366,80 +10482,71 @@ msgstr "Comanda DATA a expirat: %s: mailul nu a fost trimis"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "R�spuns de eroare 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 - timp expirat: terminarea mesajului: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "R�spuns de la server de autentificare e�uat�."
 
-#: 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 "Timp expirat pentru cererea RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "R�spuns de eroare 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 "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "R�spuns de eroare 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 octe�i"
-
-#: 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 "anex�"
 
-#: 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 "Scoate articolele selectate din lista de anexe"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Adaug� anex�..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Anexeaz� un fi�ier la mesaj"
 
@@ -10471,7 +10578,7 @@ msgstr "Tip MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerez afi�area automat� a anexei"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Clic aici pentru agend�"
 
@@ -10482,45 +10589,45 @@ msgstr "Clic aici pentru agend�"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "R�spunde la:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "De la:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Introduce�i destinatarul mesajului"
 
-#: 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 "Introduce�i adresele care vor primi o copie a mesajului"
 
-#: 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."
@@ -10531,12 +10638,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 "Descriere:"
@@ -10551,7 +10658,7 @@ msgstr "Anexeaz� un fisier"
 msgid "Could not create a PGP signature context"
 msgstr "Nu pot crea un context pentru o semn�tur� PGP."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10560,34 +10667,34 @@ msgstr ""
 "Eroare la citirea fi�ierului: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Avertisment!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Fi�ierul exist�, suprascriu?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la �nc�rcarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Eroare la accesarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Nu pot primi mesajul de la editor"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10596,7 +10703,7 @@ msgstr ""
 "Nu pot c�uta �n fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10605,7 +10712,7 @@ msgstr ""
 "Nu pot trunchia fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10614,7 +10721,7 @@ msgstr ""
 "Eroare la salvarea automat� a mesajului: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -10623,35 +10730,56 @@ msgstr ""
 "Evolution a g�sit fi�iere nesalvate �ntr-o sesiune anterioar�.\n"
 "Dori�i s� �ncerc o restaurare?"
 
-#: 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 ""
+"Acest mesaj nu a fost trimis.\n"
+"Dori�i s� salva�i modific�rile?"
+
+#: composer/e-msg-composer.c:1536
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mesaje �naintate"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Deschide fi�ier"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Salveaz� semn�tura"
 
-#: 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 "Compune un mesaj"
 
-#: 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 ""
+"Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
+"nici o identitate �n componen�a mailului."
+
+#: composer/e-msg-composer.c:2879
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10660,13 +10788,13 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
 "nici o identitate �n componen�a mailului."
 
-#: composer/e-msg-composer.c: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."
@@ -10674,8 +10802,9 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
 "nici o identitate �n componen�a mailului."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Nu pot ini�ializa compozitorul Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10735,8 +10864,8 @@ msgstr "Numele con�ine"
 msgid "Subject does not contain"
 msgstr "nu con�ine"
 
-#: 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?"
@@ -10895,7 +11024,7 @@ msgstr "ani"
 
 #: filter/filter-datespec.c:174
 #, fuzzy
-msgid "You have forgotten to choose a date."
+msgid "You must choose a date."
 msgstr "Oops. A�i uitat s� alege�i o dat�."
 
 #: filter/filter-datespec.c:269
@@ -10953,15 +11082,11 @@ msgstr "Adaug� ac�iune"
 
 #: filter/filter-folder.c:149
 #, fuzzy
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Oops, a�i uitat s� alege�i un dosar.\n"
-"V� rog merge�i �napoi �i preciza�i un dosar pentru livrarea mailului."
+msgid "You must specify a folder.\n"
+msgstr "Nume stil:"
 
-#: 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 "Alege dosar"
 
@@ -10974,7 +11099,7 @@ msgstr ""
 "Eroare �n expresia regulat� '%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"
@@ -11163,228 +11288,232 @@ msgid "Beep"
 msgstr "M�rime"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "con�ine"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiaz� �n dosar"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Date recep�ionate"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Date trimise"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "�terse"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "nu con�ine"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nu se termin� cu"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "nu exist�"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "nu exist�"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "nu sun� ca"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "nu �ncepe cu"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Nu exist�"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Ciorn�"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "se termin� cu"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Exist�"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "exist�"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Expresie"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "este"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "a fost dup�"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "a fost �nainte"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "Marcat"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "e mai mare dec�t"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "e mai mic dec�t"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nu este"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Marcat"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 #, fuzzy
 msgid "Label"
 msgstr "eticheta26"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Lista de mail"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Corp mesaj"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Antet mesaj"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Mut� in dosar"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Trimite mesaj la contact"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Red� sunetul:"
 
-#: 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 "Cite�te"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Potrivire regex"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "R�spuns la"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Ocupat"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "e mai mare dec�t"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "e mai mic dec�t"
+#: 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 "Punctaj"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Expeditor"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Seteaz� starea"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Companie"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "M�rime (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "sun� ca"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Cont surs�"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Antet specific"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "�ncepe cu"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: 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 "Subiect"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Seteaz� starea"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "con�ine"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "nu con�ine"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "nu se termin� cu"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "nu exist�"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "nu exist�"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "nu sun� ca"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "nu �ncepe cu"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "se termin� cu"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "exist�"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "Marcat"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "a fost dup�"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "a fost �nainte"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "e mai mare dec�t"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "e mai mic dec�t"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Marcat"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "nu este"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "este"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "e mai mare dec�t"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "e mai mic dec�t"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Ocupat"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "sun� ca"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "�ncepe cu"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Reguli"
@@ -11420,19 +11549,19 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr "Component� Evolution pentru manipularea mailului."
 
-#: 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 "Se import�"
 
-#: 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 "se termin� cu"
 
-#: 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"
@@ -11440,15 +11569,15 @@ msgstr ""
 "Se import� %s.\n"
 "Start %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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Trimit \"%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 "Mail"
 
@@ -11509,41 +11638,41 @@ 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 "Gunoi"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Fi�ier mail-uri locale %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 "Scanez dosarul IMAP"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 #, fuzzy
 msgid "Starting import"
 msgstr "_Data �nceput:"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Set�ri"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editeaz� 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?"
@@ -11666,109 +11795,120 @@ msgstr "Dosar V �n lista de mail"
 
 #: mail/component-factory.c:103
 #, fuzzy
+msgid "Public Mail"
+msgstr "Public"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Dosar V �n lista de mail"
+
+#: mail/component-factory.c:104
+#, fuzzy
 msgid "Virtual Trash"
 msgstr "Dosare virtuale"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Dosare virtuale"
 
-#: 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 "_Propriet��i..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Modific� propriet��ile fi�ierului"
 
-#: 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 "Nu a�i setat o metod� de transport a mailului"
 
-#: 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 "Mesaje �naintate"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compune un mesaj"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Mesaj"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Tip�re�te mesaj"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Mesaj _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 "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectare la server..."
 
-#: 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 "Propriet��i pentru \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Propriet��i"
 
-#: 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 "Nu pot crea directorul temporar: %s"
@@ -11813,140 +11953,140 @@ msgstr "%d netrimise"
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Creaz� dosar virtual din mesaj"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: 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 "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Editeaz� ca mesaj nou..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "Ti_p�re�te"
 
-#: 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�spunde la expeditor"
 
-#: 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�spunde la _list�"
 
-#: 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�spunde la to�i"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_�nainteaz�"
 
-#: 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 "Terminat"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�terge"
 
 #. 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 "Marcheaz� ca citit"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marchez ca necitit"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Rec_upereaz�"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mut �n folderul..."
 
-#: 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 "_Copiaz� �n dosarul..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adaug� expeditorul �n agend�"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplic� filtre"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creaz� regul� din mesaj"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtru pe lista de mail (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dosar V pe lista de mail (%s)"
@@ -12021,22 +12161,22 @@ msgstr "Nu a�i completat toat� informa�ia cerut�."
 msgid "Evolution Account Editor"
 msgstr "Editor de conturi 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 "Gazd�:"
 
-#: 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 "Nume utilizator:"
 
-#: 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 "Cale:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -12053,14 +12193,14 @@ msgid "Really delete account?"
 msgstr "Chiar �terge�i acest cont?"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c: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 "Invalideaz�"
 
 #: 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 "Valideaz�"
 
@@ -12146,8 +12286,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
@@ -12190,7 +12330,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Trebuie s� specifica�i un destinatar pentru a trimite acest mesaj."
 
-#: mail/mail-callbacks.c: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?"
@@ -12198,29 +12338,29 @@ msgstr ""
 "Nu pot deschide dosarul cu ciorne pentru acest cont.\n"
 "Dori�i s� folosi�i dosarul cu ciorne implicit?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Eroare necunoscut�"
 
-#: 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 "Mut� mesaj(e) �n"
 
-#: 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 "Copiaz� mesaje(le) �n"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sunte�i sigur c� dori�i s� edita�i toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12228,7 +12368,7 @@ msgstr ""
 "Pute�i numai s� edita�i mesajele\n"
 "salvate �n dosarul Ciorne"
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12236,39 +12376,39 @@ msgstr ""
 "Pute�i numai s� retrimite�i mesajele\n"
 "din dosarul Trimise"
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Sunte�i sigur c� dori�i s� retrimite�i toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Nici un mesaj selectat"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Suprascrie�i fi�ierul?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Salveaz� mesajul ca..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Salveaz� mesajele ca..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Afi�eaz� urm�torul mesaj necitit"
 
-#: 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"
@@ -12276,7 +12416,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"
@@ -12285,66 +12425,66 @@ msgstr ""
 "Eroare la �ncarcarea informa�iei de filtrare:\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 "Primesc mesajul %d din %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Tip�re�te mesaj"
 
-#: 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 "Tip�rirea mesajului nereu�it�"
 
-#: 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 ""
 "Sunte�i sigur c� dori�i s� deschide�itoate cele %d mesaje �n ferestre "
 "separate?"
 
-#: 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 "Descriere:"
 
-#: 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 "Contact schimbat:"
 
-#: 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 "Adaug� criteriu"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Salveaz� semn�tura"
@@ -12405,16 +12545,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Asistentul de conturi 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
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
@@ -13150,78 +13290,74 @@ msgstr "Nu pot crea un context pentru anvelopa S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nu pot crea contextul pentru decodarea S/MIME."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Salveaz� anexa"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nu pot crea temporar mbox `%s': %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Salveaz� anexa"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Vedere inline"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide �n %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vedere inline (via %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Ascund"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Vizualizator extern"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "�ncarc� _imaginile"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "�ncarc con�inut mesaj"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Termen dep�it"
 
-#: 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 "Deschide leg�tura �n navigator"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Copiaz� leg�tura c�tre loca�ia"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Salveaz� leg�tura ca (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salveaz� imaginea ca..."
@@ -13231,110 +13367,111 @@ msgstr "Salveaz� imaginea ca..."
 msgid "Pinging %s"
 msgstr "Trimit \"%s\""
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s anex�"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afi�ez ca surs�."
 
-#: 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
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adresa email:"
 
-#: 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 la"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "R�spuns-la:"
 
-#: 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 "La"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 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 ""
 "\n"
 "Program de mail:"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "Acest mesaj este semnat digital �i este autentic."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nu pot crea un context pentru o verificare 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 "Acest mesaj este semnat digital �i este autentic."
 
-#: 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 "Acest mesaj este semnat digital dar nu se poate dovedi c� e autentic."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator c�tre site-ul 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 "Indicator c�tre fi�ierul local (%s) valid pe site-ul \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator c�tre fi�ierul local (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator c�tre o dat� extern� necunoscut� (tip \"%s\")"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului par�ial deformat."
 
-#: 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 "Dosare speciale"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Reconfigurez dosarul"
 
-#: 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"
@@ -13343,29 +13480,24 @@ msgstr ""
 "Nu pot salva informa�ia meta a dosarului; probabil c� nu ve�i mai putea\n"
 "deschide acest dosar: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Schimb dosarul \"%s\" �n formatul \"%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."
@@ -13373,16 +13505,16 @@ msgstr ""
 "Dac� nu o s� pute�i deschide aceast� c�su�� po�tal�, atunci\n"
 "probabil va trebui s� o repara�i manual."
 
-#: mail/mail-local.c:1452
-#, fuzzy
-msgid "You cannot change the format of a non-local folder."
-msgstr "Nu pute�i copia mesaje din acest dosar"
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigureaz� %s"
 
+#: mail/mail-local.c:1510
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Nu pute�i copia mesaje din acest dosar"
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13629,21 +13761,21 @@ msgstr "A�tept..."
 msgid "User canceled operation."
 msgstr "Opera�ie anulat� de utilizator."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Memorez aceast� parol�"
 
-#: 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 "Introduce�i parola pentru %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 #, fuzzy
 msgid "Enter Password"
 msgstr "Introduce�i parola pentru %s"
@@ -13655,11 +13787,11 @@ msgstr ""
 "Nu pot deschde fi�ierul semn�tur� %s:\n"
 "%s"
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Salveaz� semn�tura"
 
-#: 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"
@@ -13668,11 +13800,12 @@ msgstr ""
 "Aceast� semn�tur� a fost modificat�, dar n-a fost salvat�.\n"
 "Dori�i s� salva�i modific�rile?"
 
-#: mail/mail-signature-editor.c: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 "Semn�tur� 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 "Nume:"
 
@@ -13710,7 +13843,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 "Dosare V"
 
@@ -13743,67 +13876,67 @@ msgstr "�naintat: (f�r� subiect)"
 msgid "%s - Message"
 msgstr "Mesaj"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Nev�zut"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "V�zut"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "R�spuns"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nev�zute multiple"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Cea mai sc�zut�"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Mai sc�zut�"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Mai mare"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: 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 "Ast�zi %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %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
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvez mesajele"
@@ -13878,46 +14011,72 @@ msgstr "R�spunde la to�i"
 msgid "Review"
 msgstr "Previzualizare"
 
-#: 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 "Terminat"
+
+#: 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 "�terge"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "_Data scadent�:"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Nume fi�ier:"
+
+#: mail/subscribe-dialog.c:229
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonare la dosarul \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Dezabonare de la dosarul \"%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 "Dosar"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Salveaz� �n dosar..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Acest eveniment a fost �ters."
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr ""
 
@@ -24706,12 +24865,12 @@ msgstr "%A %d %B"
 msgid "No description"
 msgstr "Descriere:"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Sumar mail"
 
-#: 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 "Dosare speciale"
@@ -24722,23 +24881,23 @@ msgstr "Dosare speciale"
 #. (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 "Dictionary.com Vorba zilei"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Cotele zilei"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Adaug� o surs� de �tiri"
 
-#: 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 "Introduce�i URL-ul sursei de �tiri pe care o ad�uga�i"
 
@@ -24780,12 +24939,12 @@ msgstr "Descriere:"
 msgid "My Weather"
 msgstr "Vremea"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "S-a produs o eroare la desc�rcarea sursei de �tiri</dt>"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Vremea"
 
@@ -26153,6 +26312,11 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Deschide �n %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -26387,12 +26551,25 @@ msgid "Rename folder"
 msgstr "Redenum�te dosarul '%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 "Numele dosarului specificat este invalid."
 
-#: 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 ""
+"Nu pot �terge dosarul `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -26401,12 +26578,12 @@ msgstr ""
 "Nu pot crea dosarulul precizat:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Crez� dosar nou..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nou..."
 
@@ -26436,20 +26613,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 ""
-"Import %s\n"
-"Importator nepreg�tit.\n"
-"A�tepta�i 5 secunde s� �ncerc din nou."
-
-#: 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"
@@ -26458,23 +26622,23 @@ msgstr ""
 "Se import� %s\n"
 "Se import� articol %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Alege dosar"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Dosarul `%s' nu exist�."
 
-#: 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"
@@ -26483,11 +26647,11 @@ msgstr ""
 "Nu se reu�e�te importul\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Se import�"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26496,17 +26660,17 @@ msgstr ""
 "Se import� %s.\n"
 "Start %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Eroare la start %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Eroare la �nc�rcarea %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26515,55 +26679,55 @@ msgstr ""
 "Se import� %s\n"
 "Se import� elementul 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automat"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Nume fi�ier:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Selecteaz� un fi�ier"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Tip fi�ier:"
 
-#: 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 "Import fi�iere"
 
-#: 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 la:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Alege�i dosarul destina�ie pentru importul datelor"
 
-#: 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"
 
@@ -26589,32 +26753,32 @@ msgstr "Sincronizare dosar"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Sincronizare dosar"
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Set�ri Evolution..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Deschid dosarul %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 "Deschid dosarul %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 "Deschide �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 "Nu pot redenumi dosarul: %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 ""
@@ -26657,46 +26821,46 @@ msgstr "Nu pot deschide directorul cache: %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 "Bug buddy nu a fost g�sit �n $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 nu poate fi rulat."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Despre Evolution..."
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Mergi la dosarul..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Alege�i dosarul pe care dori�i s�-l deschide�i"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Creaz� o scurt�tur� nou�"
 
-#: 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 "Alege�i dosarul spre care dori�i s� indice scurt�tura:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 #, fuzzy
 msgid "_Work Online"
 msgstr "Lucreaz� offline"
 
-#: 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 "Lucreaz� deconectat"
 
-#: 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 "Lucreaz� deconectat"
 
@@ -26704,17 +26868,17 @@ msgstr "Lucreaz� deconectat"
 msgid "(No folder displayed)"
 msgstr "(Nici un dosar afi�at)"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, fuzzy, c-format
 msgid "%s (%d)"
 msgstr "%s (...)"
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 #, fuzzy
 msgid "(None)"
 msgstr "(F�r� nume)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
@@ -26722,12 +26886,12 @@ msgstr ""
 "Evolution este actualmente conectat. Da�i clic pe buton pentru a lucra "
 "deconectat."
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution este �n proces de deconectare."
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -26743,12 +26907,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nu pot seta stocarea 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"
@@ -26756,20 +26920,20 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Con�inut invalid al mesajului"
 
-#: 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 "Eroare generic�"
 
@@ -26910,61 +27074,65 @@ msgstr "Scurt�turi"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "F�r� eroare"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Exist� deja un dosar cu acela�i nume"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Tipul de dosar specificat nu e valid"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "Eroare I/O"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Spa�iu insuficient pentru a crea dosarul"
 
-#: 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 "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Func�ie neimplementat� �n aceast� stocare"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Opera�ie nesuportat�"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Tipul specificat nu e suportat �n acest� stocare"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nu pot muta un dosar �ntr-unul din descenden�ii s�i/"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Nu pot crea dosarul blocat la %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 (...)"
@@ -27180,7 +27348,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 ""
@@ -27197,29 +27365,24 @@ msgstr "Utilitate de import Evolution"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Assistant"
-msgstr "Utilitar de import Evolution"
-
-#: shell/importer/import.glade.h:4
-#, fuzzy
 msgid "Import File (step 3 of 3)"
 msgstr "Selecteaz� un fi�ier"
 
-#: 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 "Selecteaz� un fi�ier"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 #, fuzzy
 msgid "Select a File (step 2 of 3)"
 msgstr "Selecteaz� un fi�ier"
 
-#: shell/importer/import.glade.h:8
+#: shell/importer/import.glade.h:7
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -27460,10 +27623,10 @@ msgstr "ora curent�"
 #: 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 "_Ac�iuni"
 
@@ -27594,7 +27757,7 @@ msgid "Print this item"
 msgstr "Tip�re�te acest articol"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Salveaz�"
 
@@ -27622,7 +27785,7 @@ msgstr "Salveaz� acest articol pe disc"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Fi�ier"
 
@@ -27705,7 +27868,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Programare �nt�lniri"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Personalizeaz� Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -27755,30 +27919,30 @@ msgid "Post a message to a Public folder"
 msgstr "Salvez mesaj �n dosar"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Abonare la dosarul \"%s\""
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Arat� fereastra de previzualizare mesaje"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "V� abona�i sau dezabona�i la dosarele de pe serverul distant"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor dosar virtual..."
 
-#: 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 ""
 
-#: ui/evolution-mail-global.xml.h:19
-#, fuzzy
-msgid "_Subscribe to Folders..."
-msgstr "Abonare la dosarul \"%s\""
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Schimb� propriet��ile acestui dosar"
@@ -27876,7 +28040,7 @@ msgstr "List� de mesaje �nl�n�uite"
 msgid "_Expunge"
 msgstr "Distrug_e"
 
-#: 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 "Dosar"
 
@@ -28197,7 +28361,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Caut� textul �n corpul mesajului afi�at"
 
 #: 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 "Set�ri de pagin� pentru imprimanta curent�"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -28312,7 +28477,7 @@ msgstr "Cotat"
 msgid "_Resend..."
 msgstr "_Redenume�te..."
 
-#: 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 "_Unelte"
 
@@ -28327,12 +28492,12 @@ msgstr "�nchide aceast� fereastr�"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "�n_chide"
 
 #: 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 "_Vizualizare"
 
@@ -28509,7 +28674,7 @@ msgstr "HTML"
 msgid "Save the current file and close the window"
 msgstr "Salveaz� lista �i �nchide c�su�a de dialog"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "Ajutor"
 
@@ -28682,7 +28847,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Crez� dosar nou..."
 
 #: 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
@@ -28699,115 +28864,135 @@ msgid "Pi_lot Settings..."
 msgstr "Set�ri _pilot..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Set�ri _pilot..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Crez� dosar nou..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Trimite / Prime�te"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Trimite mailurile din coad� �i descarc� mailurile noi"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Configurare mail"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configurare mail"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Arat� informa�ii despre Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Raporteaz� o eroare"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Raporteaz� o eroare"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Raporteaz� o problem� folosind Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Comut�"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Comut� �n timp ce se arat� bara folder"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Comut� �n timp ce se arat� bara cu scurt�turi"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Selecteaz� �n timp lucr�m deconecta�i"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Vizualizeaz� dosarul selectat"
 
-#: 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 "Despre Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Copiaz�..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "Bara dosar"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "Dosar"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Import�..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Mut�..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "Dosar _nou"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Preferin�e sarcini..."
+msgid "_Remove Other User's Folder"
+msgstr "Crez� dosar nou..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Redenume�te..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "Trimite / Prime�te"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Set�ri _mail..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Bara cu _scurt�turi"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Scurt�tur�"
@@ -29052,12 +29237,12 @@ msgstr "Codare caractere"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 #, fuzzy
 msgid "Search Editor"
 msgstr "Caut� �nainte"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Salveaz� c�utarea"
 
@@ -29139,6 +29324,53 @@ msgstr "init_corba(): nu pot ini�ializa GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "�te_rge"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "Adaug� ->"
+
+#, fuzzy
+#~ msgid "Scanning for new messages"
+#~ msgstr "Salvez mesajele"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Dosarul `%s' nu exist�."
+
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u octe�i"
+
+#, fuzzy
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Oops, a�i uitat s� alege�i un dosar.\n"
+#~ "V� rog merge�i �napoi �i preciza�i un dosar pentru livrarea mailului."
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Import %s\n"
+#~ "Importator nepreg�tit.\n"
+#~ "A�tepta�i 5 secunde s� �ncerc din nou."
+
+#, fuzzy
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Utilitar de import Evolution"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Preferin�e sarcini..."
+
 #~ msgid "Error in search expression."
 #~ msgstr "Eroare la c�utarea expresiei."
 
@@ -29193,14 +29425,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "Neparticipant"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Acest mesaj nu a fost trimis.\n"
-#~ "Dori�i s� salva�i modific�rile?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (implicit)"
@@ -29471,14 +29695,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "�terge tot �n afar� de semn�tur�"
 
 #, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "Semn�tur� HTML:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Nume fi�ier:"
-
-#, fuzzy
 #~ msgid "_HTML Signature:"
 #~ msgstr "Semn�tur� HTML:"
 
@@ -29510,13 +29726,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Riga"
 #~ msgstr "Dreapta:"
 
-#~ msgid "Add ->"
-#~ msgstr "Adaug� ->"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "�te_rge"
-
 #, fuzzy
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Sunte�i sigur c� dori�� s� �terge�i dosarul `%s'?"
@@ -30032,9 +30241,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "Sarcin�"
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "Set�ri _mail..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "�nainteaz� _anexat"
 
diff --git a/po/ru.po b/po/ru.po
index 33aa002714..7d75f36d1a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,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: 2002-01-30 02:21+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -319,11 +319,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"
@@ -334,47 +340,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
 msgid "Error performing search"
 msgstr "������ ��� ���������� ������"
 
@@ -392,13 +398,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"
@@ -467,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 "��������"
@@ -487,28 +493,38 @@ 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
 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 "������� ������ ���������"
@@ -556,7 +572,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(� ���� ������ Evolution SSL �� ��������������)"
 
 #: 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"
 
@@ -565,11 +581,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."
@@ -577,7 +593,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"
@@ -588,7 +604,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"
@@ -601,7 +617,7 @@ msgstr ""
 "��������� OpenLDAP, ������� ����� ����� �� �����������\n"
 "���� ������.\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,37 +628,50 @@ 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
 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"
@@ -650,7 +679,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"
@@ -658,25 +687,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, ������� ����� ������������ ��������� ��������� �����"
 
@@ -743,52 +772,52 @@ 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 "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 ""
 
-#: 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 ""
@@ -922,50 +951,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"
@@ -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,45 +1020,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 "��� 1: ���������� � �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Step 2: Connecting to Server"
 msgstr "��� 2: ����������� � �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr "��� 3: ����� ����������"
 
-#: 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 "���������������� �����"
 
-#: 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"
@@ -1031,7 +1066,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"
@@ -1040,7 +1075,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"
@@ -1048,7 +1083,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"
@@ -1058,7 +1093,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"
@@ -1068,27 +1103,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 @@ 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"
@@ -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 "������������ SSL/TLS"
 
-#: 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
@@ -1145,48 +1180,48 @@ 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
 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 "�� ������������ SSL/TLS"
 
-#: 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
@@ -1196,102 +1231,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
 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 "�ޣ���� ������"
 
-#: 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 "�����"
@@ -1306,8 +1341,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"
@@ -1338,11 +1373,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 "\"�����������\" ��������"
@@ -1416,7 +1451,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 "������"
 
@@ -1476,13 +1511,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 "�������"
 
@@ -1510,1024 +1545,1024 @@ msgstr "URI ���������� ���������:"
 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
 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 "��������"
 
@@ -2563,20 +2598,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 "��.�����"
 
@@ -2598,6 +2633,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:"
@@ -2728,7 +2776,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"
 
@@ -2778,7 +2826,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 "����������� �����"
 
@@ -2787,25 +2835,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"
@@ -2817,10 +2865,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 "����������� ������"
 
@@ -2828,7 +2876,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 "����� � �������"
@@ -2849,8 +2897,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 "��������"
 
@@ -2901,7 +2949,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 "������ ��� �������� ��������"
 
@@ -2916,9 +2964,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
@@ -3004,7 +3051,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"
@@ -3082,7 +3129,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
@@ -3090,8 +3137,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 "����������"
@@ -3100,7 +3147,7 @@ msgstr "����������"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c: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,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,abc,def,ghi,jkl,"
@@ -3110,13 +3157,13 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c: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,��,��,��,��,��,��,��,��,��,��,��,��,��,��,abc,def,ghi,jkl,mno,pqr,stu,vwx,"
 "yz"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3248,7 +3295,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 "������"
 
@@ -3273,7 +3320,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 "����������"
 
@@ -3296,7 +3343,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 "�������"
 
@@ -3358,20 +3405,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 "������"
 
@@ -3382,13 +3429,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 "�� ������� ��������� ���� ���������� ��������� ������"
 
@@ -3501,11 +3552,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"
@@ -3517,13 +3568,13 @@ msgstr ""
 "������ ����� 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
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3540,15 +3591,15 @@ msgstr ""
 "\n"
 "�� �������, ��� ������ ��������� ��� ���������?"
 
-#: 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 "�� ������� ���������������� 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 "�� ������� ������� ������� ������� ����������� � �������"
 
@@ -3597,7 +3648,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 ""
@@ -3676,9 +3727,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
@@ -3695,13 +3746,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 "���"
 
@@ -3721,78 +3772,98 @@ 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 "URI ���������� ���������:"
+
+#: 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
 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
 #, fuzzy
 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
 #, 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 "������� ����� �������"
@@ -3836,29 +3907,30 @@ 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 ""
+"��� ����������� �� ��.�����, �� 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 ""
-"��� ����������� �� ��.�����, �� Evolution �ݣ �� ������������ ����� ��� "
-"�����������. �� �� ������� ������������� ���������."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "� �����������:"
@@ -3882,110 +3954,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 "��������� �����"
 
-#: 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 ��� ������������ ���� �������������"
@@ -4006,7 +4078,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 "�������:"
 
@@ -4088,7 +4160,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 "�������"
 
@@ -4101,7 +4173,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 "�����������"
 
@@ -4111,7 +4183,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 "�������"
 
@@ -4124,7 +4196,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 "�����������"
 
@@ -4141,7 +4213,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 "�������"
 
@@ -4158,7 +4230,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 "�������"
 
@@ -4167,7 +4239,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 "�����"
 
@@ -4388,8 +4460,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 "��������� ���..."
 
@@ -4458,27 +4530,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 "���������"
 
@@ -4547,19 +4619,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 "��������..."
 
@@ -4604,7 +4676,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 ""
@@ -4616,7 +4688,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 "���������"
@@ -4691,43 +4763,43 @@ 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
 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
 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 "������"
 
@@ -4819,7 +4891,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 "����������� ��������"
 
@@ -4828,7 +4900,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:"
 
@@ -4840,17 +4912,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:"
@@ -4920,12 +4992,12 @@ msgid "100%"
 msgstr "1:00"
 
 #: 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 "�������"
@@ -4934,30 +5006,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"
@@ -4983,12 +5055,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 "�������� ����� ����� �������� ������"
@@ -4997,8 +5069,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 "���������"
 
@@ -5028,7 +5100,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 "�������"
@@ -5096,470 +5168,476 @@ 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
 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 "��������� 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 "��������� ���..."
 
-#: 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 "��������� ��� 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
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "���������� ���������"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 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
 #, fuzzy
 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 "�����.������������: "
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Accept"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "�����������������"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 #, fuzzy
 msgid "Decline"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy, 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Meeting Update"
 msgstr "����� ���������� ��������:"
 
-#: 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 "�������� ��������� ���������� �� ���������"
 
-#: 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
 #, 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 ""
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 #, fuzzy
 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
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "����� � ���������"
 
-#: 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 "�������� ��������� ���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 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
 #, fuzzy
 msgid "Task Update"
 msgstr "������ �����"
 
-#: 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 "�������� ��������� ���������� �� ������"
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "��������� ���������"
 
-#: 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 "������������ ���������� � ���������"
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 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
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL \"��������/�����\":"
 
-#: 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
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL \"��������/�����\":"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy
 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
 #, fuzzy
 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
 msgid "Select Calendar Folder"
 msgstr "������� ����� ���������"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 msgid "Select Tasks Folder"
 msgstr "������� ����� �������"
 
@@ -5604,7 +5682,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 "����������� ���������"
 
@@ -5618,52 +5696,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 "��������"
 
@@ -5753,41 +5831,48 @@ 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
 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 "����� �������..."
 
@@ -5801,7 +5886,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"
@@ -5809,7 +5900,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 +5908,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\""
@@ -5883,54 +5974,64 @@ 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
 #, fuzzy
 msgid "Event information"
 msgstr "���������� ���������"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "�������������� ����������"
 
-#: 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 �� %s)"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 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
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "���������� � ��������� (� %s �� %s)"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "���������� ���������"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "�� ������ ���� ���������� �������."
 
@@ -6170,7 +6271,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 +6294,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
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6205,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
 msgid "Print Tasks"
 msgstr "���������� �������"
 
@@ -6278,17 +6379,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"
@@ -6297,83 +6398,83 @@ msgstr ""
 "���������� �������� ����� Pine.\n"
 "������ ������������� �� � Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 msgid "Gnome Calendar"
 msgstr "��������� Gnome"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now �� ������������ ����������"
 
-#: 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 "�������� 1 make-time ������ ���� ������� ���� � ������� ISO 8601"
 
-#: 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 "time-add-day ������������ ��� time_t � �������� ��������� 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-day ������������ ����� ����� � �������� ��������� 2"
 
-#: 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 "time-day-begin ������������ ��� time_t � �������� ��������� 1"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end ������������ 1 ��������"
 
-#: 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 ������������ ��� time_t � �������� ��������� 1"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype �� ������������ ����������"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? ������������ 2 ���������"
 
-#: 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 � �������� ��������� 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? ������������ ��� time_t � �������� ��������� 2"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? ������������ ��� ���������"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? ������������ ������ � �������� ��������� 1"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? ������������ ������ � �������� ��������� 2"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6381,11 +6482,11 @@ msgstr ""
 "contains? ������������ ���� �� \"any\", \"summary\", \"description\" � "
 "�������� ��������� 1"
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? ������������ �� ������� ���� 1 ��������"
 
-#: 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)"
@@ -6393,22 +6494,27 @@ msgstr ""
 "has-categories? ������������, ��� ��� ��������� - ������ ��� ����-"
 "������������ �������� - ���������� ���� (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? �� ������������ ����������"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? ������������ 1 ��������"
 
-#: 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 � �������� ��������� 1"
 
-#: 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.
@@ -8001,81 +8107,81 @@ msgstr "���������� ����� \"%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 "������������� �����"
 
-#: 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
 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"
@@ -8123,11 +8229,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"
@@ -8452,7 +8558,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 "�������� ����� �� ������� ��� ��������������."
 
@@ -8513,51 +8619,51 @@ msgstr "POP �� SMTP, ��������� ��-POP ��������"
 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
 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 "���� ������ ����: ������� ����������"
 
@@ -8755,7 +8861,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"
@@ -8764,11 +8870,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 ""
 
@@ -8790,7 +8896,7 @@ 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"
@@ -8845,68 +8951,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
@@ -8922,28 +9036,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."
 
@@ -8960,6 +9070,11 @@ msgstr "�� ������� ������� ������� ����: %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 "�������� ����� �����"
@@ -9009,74 +9124,69 @@ 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 "�� ������� ������������ � ������� SMTP %s � ���������� ������: %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 �� ��������������."
 
-#: 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"
@@ -9087,24 +9197,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 "��� ����� �� ����� ��������� ��������"
 
@@ -9181,8 +9291,8 @@ msgstr ""
 "��� ������ � �������� ��������� ����� � ������ ������������ ����� 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 "������������� ���� � ��������� %s"
@@ -9194,7 +9304,7 @@ msgstr "��������� %s �� �������� ���������"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�� ������� �������� �����: %s: %s"
@@ -9208,32 +9318,32 @@ 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
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "�� ������� ������������� '%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 "�� ������� ������� ���� ������� ���������� � ����� \"%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 "���������� �������� ��������� � ������� ����������: ������� ����������"
 
@@ -9253,6 +9363,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"
@@ -9264,12 +9375,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"
@@ -9295,7 +9408,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 "�� ������� �������������� ����� \"%s\": %s"
@@ -9324,7 +9438,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 +9607,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 "����� ����� �� ����� ���� �������������"
 
-#: 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 �� �������� ���������"
 
-#: 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 "���� ��������� ����� %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 "����� ����� �� ����� ���� �������������"
 
-#: 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 "����� ����� �� ����� ���� �������"
 
@@ -9620,47 +9739,47 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr "���� ��������: %s"
 
-#: 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
 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 �� POP"
 
-#: 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 "���������� �������� ��������� %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "����������� �������"
 
@@ -9931,42 +10050,42 @@ 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 "������ ��� ������ �� '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 "�� ������� ������������ � ������� SMTP %s � ���������� ������: %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 "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "������ ��� ������ �� 'DATA'"
 
-#: 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"
@@ -9977,89 +10096,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 "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
 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'"
 
-#: 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
 msgid "MAIL FROM response error"
 msgstr "������ ��� ������ �� '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 "��������� ����� �������� ������ �� 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 "���� '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 "��������� ����� �������� ������ �� 'DATA': %s: ����� �� ����������"
@@ -10067,77 +10186,68 @@ 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
 msgid "DATA response error"
 msgstr "������ ��� ������ �� '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 ""
 "��������� ����� �������� DATA: ��������� ��������: %s: ����� �� ����������"
 
-#: 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 "��������� ����� �������� ������ �� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "������ ��� ������ �� '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 "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "������ ��� ������ �� 'QUIT'"
 
-#: 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 "%.1f�"
 
-#: 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 "������������ ���� � ���������"
 
@@ -10169,7 +10279,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 "�������� ����� ����� ������� �������� �����"
 
@@ -10180,45 +10290,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."
@@ -10229,12 +10339,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 "��� ��������"
@@ -10249,7 +10359,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"
@@ -10258,34 +10368,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"
@@ -10294,7 +10404,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"
@@ -10303,7 +10413,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"
@@ -10312,7 +10422,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?"
@@ -10320,28 +10430,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."
@@ -10349,7 +10470,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."
@@ -10357,20 +10489,21 @@ 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."
 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
@@ -10421,8 +10554,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?"
@@ -10570,7 +10703,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
@@ -10626,15 +10760,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 "������� �����"
 
@@ -10647,7 +10778,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 "������"
@@ -10834,222 +10965,226 @@ msgid "Beep"
 msgstr "�����"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "��������"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "����������� � �����"
 
-#: filter/libfilter-i18n.h: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 "c���������"
-
-#: 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
-msgid "is after"
-msgstr "���� �����"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "���� ��"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "������ ���"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "������ ���"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "�� ��������"
-
-#: filter/libfilter-i18n.h:34
-#, 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
 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
 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
-msgid "returns"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
 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: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 "c���������"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "���� �����"
+
+#: filter/libfilter-i18n.h:52
+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
+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 "�������"
@@ -11083,31 +11218,31 @@ msgstr "������� ���� �� ���� ����� � �������� ���������."
 msgid "Evolution is importing your old Elm mail"
 msgstr "�������������� ����� ����� �� 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 "�����"
 
@@ -11168,37 +11303,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 "�������������� ���������� �� 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
 msgid "Scanning mail filters"
 msgstr "������������ �������� ��������"
 
-#: 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?"
@@ -11314,26 +11449,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."
@@ -11341,77 +11486,78 @@ 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
 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"
@@ -11456,131 +11602,131 @@ 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
 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 "������ �� ������ �������� (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "����������� ����� �� ������ �������� (%s)"
@@ -11654,19 +11800,19 @@ 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
 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 "�� �� ������ ������� ��� �ޣ���� ������ � ���������� ������."
 
@@ -11683,14 +11829,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 "��������"
 
@@ -11777,9 +11923,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"
@@ -11822,7 +11969,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?"
@@ -11830,28 +11977,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, %d.%m.%Y, � %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."
@@ -11859,7 +12006,7 @@ msgstr ""
 "�� ������ ������� ������ ���������,\n"
 "����������� � ����� \"���������\"."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11867,38 +12014,38 @@ 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
 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"
@@ -11910,7 +12057,7 @@ msgstr ""
 "\n"
 "���������� ��� ���������?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11919,64 +12066,64 @@ 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
 #, 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 "�������"
@@ -12036,16 +12183,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 "����������� � �������..."
 
@@ -12721,78 +12868,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
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "�� ������� ������� ��������� ���� '%s': %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 "��������� ����������� ���..."
 
@@ -12801,104 +12944,105 @@ 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
 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 "�� ������� ������� �������� �������� 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 "����� external-body ������� ������������"
 
-#: 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"
@@ -12907,28 +13051,22 @@ msgstr ""
 "���������� ��������� ���������� �����, ��������, �� ����������\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: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "���������� ������� ���������� ����� %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."
@@ -12936,15 +13074,15 @@ msgstr ""
 "���� �� �� ������ ������ ������� ���� ����,\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 ""
@@ -13185,21 +13323,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 "���� ������"
 
@@ -13208,11 +13346,11 @@ msgstr "���� ������"
 msgid "Could not save signature file: %s"
 msgstr "�� ������� ��������� ���� �������: %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"
@@ -13222,11 +13360,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 "��������:"
 
@@ -13266,7 +13405,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 "����������� �����"
 
@@ -13296,67 +13435,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 "������� %I:%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 "�������� ������ ���������"
 
@@ -13430,45 +13569,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 "����������, �������� ������."
 
@@ -23368,12 +23533,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 "��������� �����"
 
@@ -23383,23 +23548,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 "UWWW"
 
-#: 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 ��������� ��������, ������� �� ������ ��������"
 
@@ -23438,11 +23603,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 "������"
 
@@ -24770,6 +24935,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"
@@ -25006,12 +25176,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"
@@ -25020,12 +25203,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 "�����..."
 
@@ -25055,20 +25238,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"
@@ -25077,22 +25247,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"
@@ -25101,11 +25271,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"
@@ -25114,17 +25284,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"
@@ -25133,31 +25303,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"
@@ -25165,24 +25335,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 "�������������"
 
@@ -25210,32 +25380,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 ""
@@ -25277,44 +25447,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 �� ������."
 
-#: 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 "������� � ����� ������ ��� ����"
 
@@ -25322,27 +25492,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 ""
@@ -25361,12 +25531,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"
@@ -25377,19 +25547,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 "������� ������"
 
@@ -25528,58 +25698,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 (...)"
@@ -25795,9 +25969,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 ""
@@ -25816,26 +25991,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"
@@ -26049,10 +26220,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 "��������"
 
@@ -26170,7 +26341,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 "���������"
 
@@ -26197,7 +26368,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 "����"
 
@@ -26279,7 +26450,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 "��������� �� ����� My Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26329,29 +26501,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 "������ ���������������� ���������"
 
-#: 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 "�������� �������� ���� �����"
@@ -26445,7 +26618,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 "�����"
 
@@ -26746,7 +26919,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
@@ -26856,7 +27030,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 "�����������"
 
@@ -26871,12 +27045,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 "���"
 
@@ -27050,7 +27224,7 @@ msgstr "HTML"
 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 "�������"
 
@@ -27215,7 +27389,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
@@ -27232,113 +27406,133 @@ 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
 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 "�����"
@@ -27580,11 +27774,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 "��������� ���������� ������"
 
@@ -27662,6 +27856,54 @@ 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 "������ � ���������."
 
@@ -27696,15 +27938,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 " (��������)"
@@ -28006,12 +28239,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Select a signature script"
 #~ msgstr "������� �ӣ ����� �������"
 
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "������������ ������ _HTML ��� ���� �������"
-
-#~ msgid "_Filename:"
-#~ msgstr "��� �����:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "���� ������� � ������� HTML:"
 
@@ -28041,12 +28268,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Riga"
 #~ msgstr "����"
 
-#~ msgid "Add ->"
-#~ msgstr "�������� ->"
-
-#~ msgid "<- Remove"
-#~ msgstr "<- �������"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "�� ������� � ���, ��� ������ ������� ����� \"%s\"?"
 
@@ -28631,9 +28852,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "������..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "��������� �����..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "��������� ������������"
 
diff --git a/po/sk.po b/po/sk.po
index 3d1066d36a..19e50fce24 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 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: 27.02.2002 13:56\n"
 "Last-Translator: Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -318,11 +318,17 @@ msgstr "Priezvisko"
 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 "Zoznam kontaktov bez mena"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
@@ -333,47 +339,47 @@ msgstr "VKartapre %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 "Nie je možné inicializovať 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 "Hľadám...."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Načítavam..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Pripájam sa na server LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Pridávam 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ňujem kartu zo 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 "Upravujem kartu na serveri LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Prijímam výsledky hľadania LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Chyba pri odstraňovaní karty"
@@ -391,13 +397,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook nenačítaný\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 "Nie je možné spustiť server 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 "Nie je možné spustiť wombat"
@@ -464,10 +470,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Vytváracie rozhranie pre ukážkový ovládací prvok Adresár"
 
 #: 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 "Kontakty"
@@ -484,28 +490,38 @@ msgstr "LDAP Server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP server obsahujúci informácie o kontaktoch"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Priečinok obsahujúci informácie o kontaktoch"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Nový 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 "Vytvoriť nový kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Nový zoznam kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "Zoznam _kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Vytvoriť nový zoznam kontaktov"
@@ -554,7 +570,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
 #: 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 "Nie je možné inicializovať gnome-vfs"
 
@@ -562,11 +578,11 @@ msgstr "Nie je možné inicializovať gnome-vfs"
 msgid "Other Contacts"
 msgstr "Iné kontakty"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Nie je možné otvoriť adresár"
 
-#: 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 ""
 "Nebolo možné otvoriť tento adresár. Prosím, overte, že cesta\n"
 "existuje a že máte dostatočné práva."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -584,7 +600,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo LDAP server nefunguje."
 
-#: 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"
@@ -595,7 +611,7 @@ msgstr ""
 "Ak chcete LDAP v Evolution používať, musíte ho prekompilovať\n"
 "z CVS po získaní OpenLDAP z tohto odkazu.\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"
@@ -605,38 +621,51 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo LDAP server nefunguje."
 
-#: 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 ""
+"Nepodarilo sa overiť na IMAP serveri.\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 "Zadajte heslo pre %s (používateľ %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "končí na"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "končí na"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategória je"
 
 #. 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 "Ľubovoľné pole obsahuje"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Pokročilé..."
 
-#: 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"
@@ -644,7 +673,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"
@@ -652,25 +681,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 "Ľubovoľná kategória"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ktoré zobrazí prehliadač priečinku"
 
@@ -737,53 +766,53 @@ msgid "  S_how Supported Bases "
 msgstr "Kontrolovať _podporované typy"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Nastavenie"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "_Odstrániť"
-
-#: 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 "Odstrániť"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Nastavenie"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -921,50 +950,56 @@ msgstr "Jeden"
 
 #: 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 "Štandardné"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Štandardné"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "_Rozsah hľadania:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h: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 "Hľadám"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Vybrať všetko"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Odstránené"
 
-#: 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"
@@ -975,7 +1010,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"
@@ -984,47 +1019,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 "Informácia o zdrojovom kóde"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Pripájam sa na 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 "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Nepodporovaná schéma"
 
-#: 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"
@@ -1032,7 +1067,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"
@@ -1041,7 +1076,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"
@@ -1049,7 +1084,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"
@@ -1059,7 +1094,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"
@@ -1069,13 +1104,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 "
@@ -1085,7 +1120,7 @@ msgstr ""
 "Toto je maximálny počet sťahovaných kariet. Ak nastavíte príliš veľké číslo, "
 "tento adresár bude pomalý."
 
-#: addressbook/gui/component/ldap-config.glade.h: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 "
@@ -1094,7 +1129,7 @@ msgstr ""
 "Toto je metóda, ktorú Evolution použije pre prihlásenie. Uvedmte si, že "
 "použitie voľby \"E-mailová adresa\" vyžaduje anonymný prístup k serveru LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h: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 "
@@ -1104,7 +1139,7 @@ msgstr ""
 "Toto meno sa bude identifikovať váš účet, ale používať sa bude iba pre "
 "zobrazenie."
 
-#: 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"
@@ -1112,11 +1147,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"
@@ -1125,26 +1160,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 "Známe meno (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "E-mailová adresa"
 
-#: 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,51 +1187,51 @@ msgstr ""
 msgid "_Add"
 msgstr "_Pridať"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_Pridať"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Pridať akciu"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Pridať akciu"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmy"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Odstrániť všetky"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Zobrazenie"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Známe meno (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 "Obmedzenie _sťahovania"
 
-#: 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,103 +1241,103 @@ msgstr "Obmedzenie _sťahovania"
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Upraviť schôdzku"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Upozorňovanie 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 "_Nastavenie"
 
-#: 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 "Štandardné"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Meno serveru:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Čas opakovania (minúty)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Účet %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "editor-zoznamu-kontaktov"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Žiadne karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Znovu sa pripojujem na %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 "Všeobecné"
 
-#: 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 "Hľadám"
@@ -1317,8 +1352,8 @@ msgstr "Vytváracie rozhranie pre rozhranie pre výber mena adresára."
 
 #. 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"
@@ -1349,11 +1384,11 @@ msgstr "(%d nezobrazených)"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez mena"
 
-#: 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 "Vyberte kontakty z adresára"
 
-#: 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 "Odosielateľ obsahuje"
@@ -1427,7 +1462,7 @@ msgid "D_epartment:"
 msgstr "O_ddelenie:"
 
 #: 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 "Detaily"
 
@@ -1486,13 +1521,13 @@ msgstr "Chce prijímať poštu ako _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 "_Odstrániť"
 
@@ -1520,1024 +1555,1024 @@ msgstr "URL pre _verejný kalendár:"
 msgid "_Web page address:"
 msgstr "Adresa _WWW stránky:"
 
-#: 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 "Spojené štáty"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afgánistá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 "Albánsko"
 
-#: 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žírsko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Americká 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 "Antarktída"
 
-#: 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 a 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 "Argentína"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "Arménia"
 
-#: 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 "Austrália"
 
-#: 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 "Rakúsko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Ázerbajdžán"
 
-#: 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 "Bahamy"
 
-#: 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 "Bahrajn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladéš"
 
-#: 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 "Bielorusko"
 
-#: 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 "Belgicko"
 
-#: 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 "Bermudy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Bútán"
 
-#: 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 "Bolívia"
 
-#: 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 "Bosna a 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 Island"
 
-#: 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 "Brazília"
 
-#: 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 "Britské teritórium v Indickom oceáne"
 
-#: 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 "Bulharsko"
 
-#: 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 "Cape 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 "Kajmanské ostrovy"
 
-#: 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 "Stredoafrická republika"
 
-#: 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 "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Čína"
 
-#: 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 "Vianočné ostrovy"
 
-#: 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 "Kokosové ostrovy"
 
-#: 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 "Komory"
 
-#: 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 "Cookove ostrovy"
 
-#: 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 "Kostarika"
 
-#: 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 "Pobrežie slonoviny"
 
-#: 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 "Chorvátsko"
 
-#: 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 "Cyprus"
 
-#: 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 "Česká Republika"
 
-#: 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ánsko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Džibuti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "Dominikánska republika"
 
-#: 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 "Dominikánska Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Východný 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 "Ekvádor"
 
-#: 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 "Egypt"
 
-#: 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 "Salvádor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Rovníková 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 "Estónsko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklandské ostrovy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Farejské ostrovy"
 
-#: 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 "Fínsko"
 
-#: 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 "Francúzsko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Francúzska Guajana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Francúzska Polynézia"
 
-#: 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 "Francúzske južné teritóriá"
 
-#: 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 "Gruzínsko"
 
-#: 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 "Nemecko"
 
-#: 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écko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grónsko"
 
-#: 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 "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 "Guajana"
 
-#: 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 "Heardove a McDonaldove ostrovy"
 
-#: 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 "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 "Maďarsko"
 
-#: 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 "Indonézia"
 
-#: 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 "Írsko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Izrael"
 
-#: 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 "Taliansko"
 
-#: 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 "Jamajka"
 
-#: 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 "Japonsko"
 
-#: 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 "Jordánsko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazachstán"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Keňa"
 
-#: 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 "Kórejská republika"
 
-#: 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 "Kuvajt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kirgizstán"
 
-#: 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 "Lotyšsko"
 
-#: 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 "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 "Lichtenštajnsko"
 
-#: 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 "Litva"
 
-#: 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 "Luxembursko"
 
-#: 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 "Makedónia"
 
-#: 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 "Malajzia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Maledivy"
 
-#: 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 "Marshallove ostrovy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "Martinik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "Mauretánia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Maurícius"
 
-#: 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 "Mikronézia"
 
-#: 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 "Moldavská republika"
 
-#: 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 "Mongolsko"
 
-#: 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 "Mozambik"
 
-#: 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 "Namíbia"
 
-#: 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 "Nepál"
 
-#: 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 "Holandsko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Holandské Antily"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Nová Kaledónia"
 
-#: 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 "Nový Zéland"
 
-#: 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 "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 "Ostrov 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 "Severné Mariánske ostrovy"
 
-#: 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 "Nórsko"
 
-#: 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 "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 "Palestínske územia"
 
-#: 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 Nová 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 "Paraguaj"
 
-#: 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 "Filipíny"
 
-#: 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 "Poľsko"
 
-#: 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 "Portugalsko"
 
-#: 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 "Portoriko"
 
-#: 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 "Rumunsko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Ruská federácia"
 
-#: 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 "Sv. Kitts a 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 "Sv. 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 "Sv. Vincent a Grenadíny"
 
-#: 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 a 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 "Saudská Arábia"
 
-#: 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 "Seychelly"
 
-#: 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 "Slovensko"
 
-#: 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 "Slovinsko"
 
-#: 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 Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somálsko"
 
-#: 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 "Južná 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 "Južná Georgia a Južné Sandwich ostrovy"
 
-#: 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 "Španielsko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Srí 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 "Sv. 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 "Sv. Pierre a Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Súdá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 "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 a Jan Mayenove ostrovy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Swazijsko"
 
-#: 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 "Švédsko"
 
-#: 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 "Švajčiarsko"
 
-#: 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 "Tadžíkistán"
 
-#: 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 "Spojená republika Tanzánia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Thajsko"
 
-#: 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 a Tobago"
 
-#: 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 "Turecko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Turkménistán"
 
-#: 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 "Turecké a Caicoské ostrovy"
 
-#: 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 "Ukrajina"
 
-#: 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 "Spojené Arabské Emiráty"
 
-#: 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 "Spojené kráľovstvo"
 
-#: 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 "Uruguaj"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Uzbekistán"
 
-#: 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 "Britské panenské ostrovy"
 
-#: 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 "Americké paneské ostrovy"
 
-#: 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 And Futuna Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Západná 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 "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 "Juhoslávia"
 
-#: 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"
 
@@ -2572,20 +2607,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nie je možné nájsť prvok pre pole: `%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 "Rýchly kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Upraviť celé"
 
-#: 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 "Celé meno"
 
-#: 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"
 
@@ -2607,6 +2642,19 @@ msgstr ""
 "%s už existuje.\n"
 "Chcete ho prepísať?"
 
+#: 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 "Prepísať súbor?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresa _2:"
@@ -2737,7 +2785,7 @@ msgstr "editor-zoznamu-kontaktov"
 msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
-#: 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 "Uložiť zoznam ako VCard"
 
@@ -2787,7 +2835,7 @@ msgstr ""
 "priečinku existuje. Chcete ho aj tak pridať?"
 
 #: 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 "Pokročilé hľadanie"
 
@@ -2796,24 +2844,24 @@ msgstr "Pokročilé hľadanie"
 msgid "Search"
 msgstr "Hľadať"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Žiadne karty"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 karta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d kariet"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 msgid "Error getting book view"
 msgstr "Chyba pri vytváraní pohľadu na adresár"
 
-#: 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 "Úspech"
 
 #: 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 "Neznáma chyba"
 
@@ -2836,7 +2884,7 @@ msgstr "Neznáma chyba"
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
-#: 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 "Prístup zamietnutý"
@@ -2857,8 +2905,8 @@ msgstr "Protokol nepodporovaný"
 #: 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 "Zrušený"
 
@@ -2909,7 +2957,7 @@ msgstr "Chyba pri odstraňovaní zoznamu"
 
 #: 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 pri odstraňovaní karty"
 
@@ -2922,11 +2970,10 @@ msgid "Display Cards"
 msgstr "Zobraziť 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, aby %d kariet bolo kartami. Otvorí sa %d nový okien.\n"
 "Naozaj chcete zobraziť všetky tieto karty?"
@@ -3014,7 +3061,7 @@ msgstr "Adresár"
 
 #: 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žiť ako VCard"
@@ -3098,7 +3145,7 @@ msgstr "Kopírovať"
 msgid "Paste"
 msgstr "Vložiť"
 
-#: 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
@@ -3106,8 +3153,8 @@ msgstr "Vložiť"
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: 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 "_Aktuálny pohľad"
@@ -3116,7 +3163,7 @@ msgstr "_Aktuálny pohľad"
 #. 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"
 
@@ -3124,11 +3171,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"
@@ -3260,7 +3307,7 @@ msgid "Include:"
 msgstr "Vložiť:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Na šírku"
 
@@ -3285,7 +3332,7 @@ msgid "Options"
 msgstr "Nastavenie"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientácia"
 
@@ -3308,7 +3355,7 @@ msgstr "Zdroj papiera:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Na výšku"
 
@@ -3370,20 +3417,20 @@ msgstr "Schôdzka bez mena"
 
 #: 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 "Vysoká"
 
 #: 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 "Normálny"
 
 #: 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 "Nízka"
 
@@ -3394,13 +3441,17 @@ msgstr "Nízka"
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
-#: 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 "Chyba pri komunikácii s kalendárovým serverom"
 
-#: 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 "Nie je možné prečítať blok aplikácie Calendar pilota"
 
@@ -3510,11 +3561,11 @@ msgstr "Čas opakovania (minúty)"
 msgid "_Edit appointment"
 msgstr "_Upraviť schôdzku"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Popis nie je k dispozícii."
 
-#: 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"
@@ -3525,13 +3576,13 @@ msgstr ""
 "pomocou e-mailu, ale toto upozornenie tak bolo nastavené.\n"
 "Evolution preto zobrazí normálny dialóg."
 
-#: calendar/gui/alarm-notify/alarm-queue.c: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 "Varovanie"
 
-#: 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 "
@@ -3548,15 +3599,15 @@ msgstr ""
 "\n"
 "Chcete tento program spustiť?"
 
-#: 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 "Pre tento program túto správu už nezobrazovať."
 
-#: 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 "Nie je možné inicializovať 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 "Nie je možné vytvoriť vytváracie rozhranie pre službu upozorňovania"
 
@@ -3605,7 +3656,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 ""
@@ -3684,9 +3735,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
@@ -3703,13 +3754,13 @@ msgid "Assigned"
 msgstr "Priradené"
 
 #: 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 "Áno"
 
 #: 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 "Nie"
 
@@ -3729,76 +3780,96 @@ msgstr "Týždeň"
 msgid "Month View"
 msgstr "Mesiac"
 
-#: 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 "Kalendár"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Priečinok obsahujúci schôdzky a udalosti"
 
-#: 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 pre _verejný kalendár:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Priečinok obsahujúci schôdzky a udalosti"
+
+#: 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 "Úlohy"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Priečinok obsahujúci úlohy to-do"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Tlačiť karty"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Priečinok obsahujúci úlohy to-do"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "_Stretnutie"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 msgid "Create a new meeting request"
 msgstr "Vytvorí novú požiadavku na stretnutie"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Nová úloha"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Vytvorí novú úlohu"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Vytvoriť novú schôdzku"
@@ -3842,29 +3913,30 @@ msgid "Alarm Repeat"
 msgstr "Opakovanie 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 poštové pripomenutie, ale Evolution túto funkciu zatiaľ nepodporuje. "
+"Pre toto pripomenutie nebudete môcť upravovať jeho nastavenia."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Zobrazovaná správa"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Prehrať zvuk:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Opakovať alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Spustiť 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 poštové pripomenutie, ale Evolution túto funkciu zatiaľ nepodporuje. "
-"Pre toto pripomenutie nebudete môcť upravovať jeho nastavenia."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "S týmito argumentami:"
@@ -3888,110 +3960,110 @@ msgstr "hodín"
 msgid "minutes"
 msgstr "minút"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d dní"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 deň"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d týždňov"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 týždeň"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d hodín"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 hodina"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minút"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 minúta"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekúnd"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: 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 "Prehrať 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 "Zobraziť správu"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Poslať 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 "Spustiť program"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Má sa vykonať neznáma akcia"
 
-#: 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 pred začiatkom schôdzky"
 
-#: 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čiatku schôdzky"
 
-#: 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 na začiatku schôdzky"
 
-#: 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 pred koncom schôdzky"
 
-#: 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 schôdzky"
 
-#: 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 schôdzky"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s o %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 pre neznámy typ spustenia"
@@ -4012,7 +4084,7 @@ msgstr "Pripomenutia"
 
 #: 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 "Súhrn:"
 
@@ -4095,7 +4167,7 @@ msgid "Days"
 msgstr "Dni"
 
 #: 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 "Piatok"
 
@@ -4108,7 +4180,7 @@ msgid "Minutes"
 msgstr "Minúty"
 
 #: 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 "Pondelok"
 
@@ -4118,7 +4190,7 @@ msgid "S_un"
 msgstr "_Ne"
 
 #: 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 "Sobota"
 
@@ -4131,7 +4203,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
 
 #: 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 "Nedeľa"
 
@@ -4150,7 +4222,7 @@ msgid "Task List"
 msgstr "_Zoznam úloh"
 
 #: 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 "Štvrtok"
 
@@ -4167,7 +4239,7 @@ msgid "Time format:"
 msgstr "Formát času:"
 
 #: 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 "Utorok"
 
@@ -4176,7 +4248,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 "Streda"
 
@@ -4400,8 +4472,8 @@ msgid "No summary"
 msgstr "Žiadny súhrn"
 
 #: 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 "Uložiť ako..."
 
@@ -4470,27 +4542,27 @@ msgstr "Delegovať na:"
 msgid "Enter Delegate"
 msgstr "Zadajte na koho delegovať"
 
-#: 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 "Schôdzka"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Pripomenutie"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Opakovanie"
 
-#: 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ánovanie"
 
-#: 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 "Stretnutie"
 
@@ -4559,19 +4631,19 @@ msgstr "Čas _konca:"
 msgid "_Start time:"
 msgstr "Čas _začiatku:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Organizátor je vyžadovaný."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Nutný je aspoň jeden účastník."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Táto osoba sa už zúčastňuje!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Delegovať na..."
 
@@ -4611,7 +4683,7 @@ msgid "Member"
 msgstr "Člen"
 
 #: 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"
@@ -4623,7 +4695,7 @@ msgstr "Rola"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
@@ -4699,48 +4771,48 @@ msgstr " "
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "zapnutá"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "zoznam"
 
-#: 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 "sekundy"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Iné"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "Sever"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "zoznam"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Ďalší 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 "deň"
 
-#: 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 "výskytov"
 
@@ -4832,7 +4904,7 @@ msgstr "Dátum dokončenia:"
 
 #: 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 "Potrebné úkony"
 
@@ -4841,7 +4913,7 @@ msgid "Progress"
 msgstr "Priebeh"
 
 #: 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:"
 
@@ -4853,17 +4925,17 @@ msgstr "_Priorita:"
 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 "Priradenie"
 
-#: 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:"
@@ -4933,12 +5005,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 "Odstráňujem vybrané objekty"
 
-#: 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 "_Otvoriť"
@@ -4948,30 +5020,30 @@ msgstr "_Otvoriť"
 msgid "_Save as..."
 msgstr "Uložiť ako..."
 
-#: 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 "_Tlačiť..."
 
-#: 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 "Vystri_hnúť"
 
-#: 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 "_Kopírovať"
 
-#: 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"
@@ -5000,12 +5072,12 @@ msgstr "_Označiť úlohy ako dokončené"
 msgid "_Delete Selected Tasks"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: 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 "Aktualizujem 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 "Kliknutím pridáte úlohu"
@@ -5014,8 +5086,8 @@ msgstr "Kliknutím pridáte úlohu"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: 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 "Hotovo"
 
@@ -5044,7 +5116,7 @@ msgid "Start Date"
 msgstr "Dátum štartu"
 
 #: 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 "Súhrn"
@@ -5111,451 +5183,457 @@ msgstr "dopoludnia"
 msgid "pm"
 msgstr "popoludní"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Nová _schôdzka"
 
-#: 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 "Nová celodenná _udalosť"
 
-#: 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 "Nové stretnutie"
 
-#: 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 "Nová úloha"
 
-#: 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 "Tlačiť..."
 
-#: 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 "Prejsť na d_nešný dátum"
 
-#: 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 "_Prejsť na dátum..."
 
-#: 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 "_Publikovať informácie o voľnom čase"
 
-#: 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 "Nastaviť %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 "Nastaviť %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 "Uložiť _ako..."
 
-#: 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 "Naplánovať _stretnutie"
 
-#: 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 "Poslať ďalej ako 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 "Nastaviť tento výskyt ako _presunuteľný"
 
-#: 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 "Odstrániť tento vý_skyt"
 
-#: 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 "Odstrániť _všetky výskyty"
 
-#: 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 "Vyzerá to, že nemáte nainštalované nástroje pre PalmPilota GNOME."
 
-#: 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 "Chyba pri vykonávaní %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 "Končí: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Dokončený "
 
-#: 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 "Informácie o iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "Chyba 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 "Neznáma osoba"
 
 #. 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> Prosím, skontrolujte tieto informácie a potom vyberte z menu akciu."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Žiadna</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "_Miesto: "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "Stav:"
 
-#: 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 "Akceptované"
 
-#: 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 "Predbežne akceptové"
 
-#: 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 "Odmietnuté"
 
-#: 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 "Neznámy"
 
-#: 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 "Vyberte akciu:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: 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 "Akceptovať"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Predbežne akceptovať"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Poslať informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Aktualizovať stav respondenta"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Poslať najnovšie informácie"
 
-#: 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 "Zrušiť"
 
-#: 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> poslal informácie o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Informácie o stretnutí"
 
-#: 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> požaduje vašu účasť na stretnutí."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Návrh na stretnutie"
 
-#: 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> si praje byť pridaný na existujúce stretnutie."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Aktualizácia stretnutia"
 
-#: 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> si praje dostať najnovšie informácie o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Požiadavka na aktualizáciu stretnutia"
 
-#: 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> odpovedal na požiadavku o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Odpoveď pre stretnutie"
 
-#: 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> zrušil stretnutie."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Zrušenie stretnutia"
 
-#: 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> poslal nerozpoznateľnú správu."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Neplatná správa o stretnutí"
 
-#: 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> poslal informácie o úlohe."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Informácia o úlohe"
 
-#: 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> požaduje, aby ste vykonali úlohu."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Návrh úlohy"
 
-#: 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> si praje byť pridaný do existujúcej úlohy."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Aktualizácia úlohy"
 
-#: 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> si praje získať najnovšie informácie o úlohe."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Požiadavka na aktualizáciu úlohy"
 
-#: 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> odpovedal na priradenie úlohy."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Odpoveď pre úlohu"
 
-#: 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> zrušil úlohu."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Zrušenie úlohy"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Neplatná správa úlohy"
 
-#: 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> publikoval informácie o voľnom čase."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Informácie o voľnom čase"
 
-#: 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> požaduje informáciu o vašom voľnom čase."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Požiadavka na informácie o voľnom čase"
 
-#: 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> odpovedal na požiadavku na informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Odpoveď s informácio o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná správa o voľnom čase"
 
-#: 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 "Priečinok vyzerá ako nenapraviteľne poškodený."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Táto správa obsahuje iba nepodporované požiadavky."
 
-#: 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 "Príloha neobsahuje platnú správu kalendára"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "Príloha nemá žiadne zobraziteľné položky kalendára"
 
-#: calendar/gui/e-itip-control.c: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 "Nastala chyba pri sťahovaní dát pre"
 
-#: 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 "Položku nie je možné poslať!\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 "Nie je možné otvoriť priečinok v `%s'"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Súbor kalendára nie je aktualizovať!\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 ""
 "Stav účastníka nie je možné aktualizovať, pretože položka už neexistuje"
 
-#: 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 ""
 "Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je platný!\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 "Nie je možné otvoriť priečinok v `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nie je možné aktualizovať!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Odstránenie dokončené"
 
-#: 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 "Položka poslaná!\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 "Položku nie je možné poslať!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vybrať priečinok"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vybrať priečinok"
@@ -5601,7 +5679,7 @@ msgstr "dátum začiatku"
 msgid "Chair Persons"
 msgstr "Predsedovia"
 
-#: 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 "Vyžadovaní účastníci"
 
@@ -5615,52 +5693,52 @@ msgid "Resources"
 msgstr "Zdroj"
 
 #: 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 "Individuálne"
 
 #: 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 "Skupina"
 
 #: 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 "Zdroj"
 
 #: 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 "Miestnosť"
 
 #: 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 "Predseda"
 
 #: 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 "Vyžadovaný účastník"
 
 #: 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 "Nepovinný účastník"
 
 #: 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 "Bez účasti"
 
 #: 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 "Predbežný"
 
 #: 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 "Delegované"
 
@@ -5750,42 +5828,49 @@ msgstr "_Začiatok stretnutia:"
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
-#: 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 "Otváram úlohy 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 "Nepodarilo sa načítať úlohy 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 "Metódy potrebná pre načítanie `%s' nie je podporovaná"
 
-#: 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 "Nie je možné otvoriť priečinok 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 pri štarte %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Dátum dokončenia"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Odstráňujem vybrané objekty"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
@@ -5799,7 +5884,13 @@ msgstr "Nie je možné otvoriť priečinok v `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Metóda nutná k otvoreniu `%s' nie je podporovaná"
 
-#: 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 "Upozornenie na %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5807,7 +5898,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"
@@ -5815,12 +5906,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 "Otváram kalendára na%s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Otváram priečinok %s"
@@ -5881,49 +5972,58 @@ msgstr "Október"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Nutný je aspoň jeden účastník"
-
-#: 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 "Organizátor musí byť nastavený."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Nutný je aspoň jeden účastník"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "informácie o udalosti"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Informácie o úlohe"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Informácie o denníku"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Informácie o voľnom čase"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Informácie o kalendári"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Aktualizovať"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Obnoviť zoznam"
 
-#: 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 "Informácie o voľnom čase (%s do %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "Informácie iCalendar"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť účastníkom stretnutia."
 
@@ -6159,7 +6259,7 @@ msgid "Print Calendar"
 msgstr "Tlačiť kalendár"
 
 #: 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 "Ukážka pred tlačou"
@@ -6182,7 +6282,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktoré bude zobrazovať priečinok úloh"
 
-#: 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"
@@ -6194,12 +6294,12 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: 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 "Túto správu už nezobrazovať."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tlačiť karty"
@@ -6269,17 +6369,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Nie je možné sa spojiť so skladom: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Pripomenutie"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Správa kalendára"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6288,84 +6388,84 @@ msgstr ""
 "Evolution našiel poštové súbory Pine.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalendár"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now neočakáva žiadne argumenty"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time očakáva 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 očakáva ako prvý argument reťazec"
 
-#: 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 očakáva prvý argument reťazec dátumu/času podľa ISO 8601"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day očakáva dva argumenty"
 
-#: 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 očakáva ako prvý argument 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 očakáva ako druhý argument celé číslo"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin očakáva jeden 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 očakáva ako prvý argument time_t"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end očakáva jeden 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 očakáva ako prvý argument time_t"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype neočakáva argumenty"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? očakáva dva argumenty"
 
-#: 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? očakáva ako prvý argument 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? očakáva ako druhý argument time_t"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? očakáva dva argumenty"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? očakáva ako prvý argument reťazec"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? očakáva ako druhý argument reťazec"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6373,11 +6473,11 @@ msgstr ""
 "contains? očakáva ako prvý argument jednu z hodnôt \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? očakáva aspoň jeden 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)"
@@ -6385,22 +6485,27 @@ msgstr ""
 "has-categories? očakáva ako všetky argumenty reťazce alebo presne jeden "
 "argument boolean nepravu (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? neočakáva žiadne argumenty"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? očakáva jeden 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? očakáva ako prvý argument 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 "Vyhodnotenie výrazu pre hľadanie neskončilo pravdivostnou hodnotou"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Iná chyba"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -7994,81 +8099,81 @@ msgstr "Ukladám priečinok '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Pre dokončenie tejto operácie musíte pracovať on-line"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Synchronizujem priečinky"
 
-#: 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 "Chyba pri spracovávaní filtra: %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 "Chyba pri vykonávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Nie je možné otvoriť priečinok fronty"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Nie je možné spracovať priečinok fronty"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Získavam správu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Nie je možné otvoriť správu"
 
-#: 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 "Zlyhala správa %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 "Synchronizujem priečinok"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Získavam správu %d z %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Nepodarilo sa prijať správu"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neplatné argumenty"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neplatné argumenty"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nepodarilo sa uložiť správu %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 "Nepodarilo sa uložiť správu %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 "Chyba pri vykonávaní hľadania filtra: %s: %s"
@@ -8115,11 +8220,11 @@ msgstr "Nepodporovaná operácia: hľadanie výrazom: %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodporovaná operácia: hľadanie pomocou uid: %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Presúvam správy"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Kopírujem správy do %s"
@@ -8443,7 +8548,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 "Neplatná odpoveď na overenie od serveru."
 
@@ -8500,52 +8605,52 @@ msgstr "Prihlásenie POP pred SMTP nie pomocou zdroja POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Preklad regulárneho výrazu zlyhal: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vyžaduje komponentu používateľského mena"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vyžaduje komponentu hostiteľa"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vyžaduje komponentu cesty"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Zisťujem adresu: %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 "Zlyhalo hľadanie mena: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: hostiteľ nenájdený"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: neznámy dôvod"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Zisťujem adresu: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: hostiteľ nenájdený"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: neznámy dôvod"
@@ -8744,7 +8849,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"
@@ -8757,11 +8862,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 "DOBRE"
 
-#: 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 "ZLE"
 
@@ -8783,7 +8888,7 @@ msgstr ""
 "Chcete ho aj tak akceptovať?"
 
 #. 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"
@@ -8838,68 +8943,76 @@ msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
 
-#: camel/providers/imap/camel-imap-command.c: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 "Operácia zrušená"
 
-#: 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 neočakávane zrušil spojenie: %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 "Neočakávaná odpoveď od IMAP serveru: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Neočakávaná odpoveď od IMAP serveru: %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 príkaz zlyhal: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Odpoveď serveru skončila príliš skoro."
 
-#: 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 "Odpoveď IMAP serveru neobsahovala informáciu %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 "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
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie je možné vytvoriť priečinok %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 "Nie je možné načítať súhrn pre %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 "Priečinok bol zničený a znovu vytvorený 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
 msgid "Scanning for changed messages"
 msgstr "Hľadám zmenené sprá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 "Nepodarilo sa prijať sprá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
@@ -8915,28 +9028,24 @@ msgstr ""
 "Nie je možné získať sprá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
 msgid "No such message"
 msgstr "Taká správa neexistuje"
 
-#: 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áto správa momentálne nie je k dipozícii"
 
-#: 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 "Sťahujem súhrnné informácie pre nové správy"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Hľadám nové správy"
-
-#: 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 "Nie je možné nájsť telo správy v odpovedi FETCH."
 
@@ -8953,6 +9062,11 @@ msgstr "Nie je možné otvoriť priečinok pre vyrovnávaciu pamäť: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Nepodarilo sa uložiť správu %s: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Nepodarilo sa uložiť správu %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Kontrolujem novú poštu"
@@ -9001,77 +9115,72 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
 
-#: 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 služba pre %s na %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 "Spojenie zrušené"
 
-#: 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 "Nie je možné spojenie s %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 ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %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 "Operácia nepodporovaná"
 
-#: 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 "Overenie zlyhalo."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Priečinok je prázdny"
-
-#: 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 "Požadovaný spôsob overenia %s nie je podporovaný IMAP serverom %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 "Overenie typu %s nie je podporované."
 
-#: 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 "%sProsím, zadajte IMAP heslo pre %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 "Nezadali ste heslo."
 
-#: 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"
@@ -9082,24 +9191,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 "Priečinok %s neexistuje"
 
-#: 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 "Meno priečinku nesmie obsahovať znak Enter."
 
-#: 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 "Neznáma chyba: %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 "Rodičovský priečinok nesmie obsahovať podpriečinky"
 
@@ -9177,8 +9286,8 @@ msgstr ""
 "Unix 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 "Koreň ukladania %s nie je absolútna cesta"
@@ -9190,7 +9299,7 @@ msgstr "Koreň ukladania %s nie je normálny priečinok"
 
 #: 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 "Nie je možné získať priečinok: %s: %s"
@@ -9204,32 +9313,32 @@ msgstr "Lokálne ukladanie nemá priečinok pre novú poštu"
 msgid "Local mail file %s"
 msgstr "Lokálny poštový súbor %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 "Nie je možné premenovať priečinok %s na %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 "Nie je možné premenovať priečinok: %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 "Nie je možné odstrániť súbor súhrnu priečinku `%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 "Nie je možné odstrániť indexový súbor priečinku`%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 "Nie je možné uložiť súhrn: %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 "Nie je možné pridať správu do súhrnu: neznámy dôvod"
 
@@ -9249,6 +9358,7 @@ msgstr "Neplatný obsah správy"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9260,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 "Priečinok `%s' neexistuje."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9291,7 +9403,8 @@ msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c: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 "Nie je možné prehľadať priečinok `%s': %s"
@@ -9321,7 +9434,7 @@ msgid "Storing folder"
 msgstr "Ukladám priečinok"
 
 #: 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 "Nie je možné získať zámok na priečinok %s: %s"
@@ -9490,40 +9603,45 @@ msgstr "`%s' nie je priečinok."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nie je možné otvoriť cestu 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 "Lokálne priečinky nie je možné premenovať"
 
-#: 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 "Koreň ukladania %s nie je normálny priečinok"
 
-#: 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 "Priečinok `%s/%s' neexistuje."
 
-#: 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' nie je normálny súbor."
+
+#: 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 "Lokálny poštový súbor %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 "Lokálne priečinky nie je možné premenovať"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Lokálne priečinky nie je možné premenovať"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Lokálne priečinky nie je možné odstrániť"
 
@@ -9616,47 +9734,47 @@ msgstr "Použite Zrušiť"
 msgid "Operation failed: %s"
 msgstr "Operácia zlyhala: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Získavam POP súhrn"
 
-#: 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 "Používateľ zrušený"
 
-#: 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 "Nie je možné súhrn POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Odstraňujem zmazané správy"
 
-#: 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 "Žiadna správa s 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 "Získavam POP správu %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 "Nie je možné získať správu %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"
 
@@ -9928,45 +10046,45 @@ msgstr "Dočasné zlyhanie overenia."
 msgid "Authentication required"
 msgstr "Autentifikácia vyžadovaná"
 
-#: 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
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Správa nevyzerá ako platná."
 
-#: 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žiadavky 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
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsím, zadajte SMTP heslo pre %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9977,88 +10095,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 "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 "Doručenie 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 "Nie je možné poslať správu: adresa odosielateľa nie je platná."
 
-#: 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 "Posielam sprá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 "Nie je možné poslať správu: adresáti nie sú definovaní."
 
-#: 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 "Nie je možné poslať správu: adresáti nie sú platní"
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "Pozdrav 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 "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 "Prihlásenie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Chyba pri vytváraní overovacieho 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
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Požiadavka AUTH zlyhala."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatná odpoveď na overenie od serveru.\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 "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 odpovede 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 "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> zlyhal"
 
-#: 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 "Vypršal čas posielania DATA: %s: pošta neodoslaná"
@@ -10066,76 +10184,67 @@ msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 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
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Vypršal čas posielania DATA: koniec správy: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "Chyba odpovede ukončenia 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 "Vypršal čas odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 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žiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "Chyba odpovede QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 bajt"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u bajtov"
-
-#: 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 "príloha"
 
-#: 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 "Odstráni vybrané položky zo zoznamu príloh"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Pridať prílohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Priloží súbor k správe"
 
@@ -10167,7 +10276,7 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresár"
 
@@ -10178,45 +10287,45 @@ msgstr "Kliknutím zobrazíte adresár"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: 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 "Zadajte adresy, ktoré dostanú kópiu správy"
 
-#: 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."
@@ -10227,12 +10336,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 "Bez popisu"
@@ -10247,7 +10356,7 @@ msgstr "Priložiť súbor"
 msgid "Could not create a PGP signature context"
 msgstr "Nepodarilo sa vytvoriť kontext podpisu PGP."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10256,34 +10365,34 @@ msgstr ""
 "Chyba pri čítaní súboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Varovanie!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Súbor existuje, prepísať ho?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri prístupe k súboru: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je možné získať správu z editora"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10292,7 +10401,7 @@ msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10301,7 +10410,7 @@ msgstr ""
 "Nepodarilo sa skrátiť súbor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10310,7 +10419,7 @@ msgstr ""
 "Chyba pri automatickom ukladaní správ: %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?"
@@ -10318,28 +10427,39 @@ msgstr ""
 "Ximian Evolution našiel neuložené súbory z predchádzajúceho sedenia.\n"
 "Chcete sa pokúsiť o ich záchranu?"
 
-#: composer/e-msg-composer.c: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áto správa nebola odoslaná.\n"
+"\n"
+"Chcete uložiť zmeny?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Varovanie: Zmenená správa"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Uložiť podpis"
 
-#: 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 "Napísať správu"
 
-#: 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."
@@ -10347,7 +10467,18 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
 
-#: composer/e-msg-composer.c: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 ""
+"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
+"Nepodarilo sa aktivovať komponent HTML editor."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10355,13 +10486,13 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať komponent HTML editor."
 
-#: 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."
@@ -10369,8 +10500,9 @@ msgstr ""
 "Nie je možné vytvoriť okno pre písanie správ, pretože ste ešte\n"
 "nenastavili žiadne identity pre poštový komponent."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Nie je možné inicializovať editor správ Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10421,8 +10553,8 @@ msgstr "Predmet obsahuje"
 msgid "Subject does not contain"
 msgstr "Predmet neobsahuje"
 
-#: 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?"
@@ -10570,7 +10702,8 @@ msgid "years"
 msgstr "rokov"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Zabudli ste vybrať dátum."
 
 #: filter/filter-datespec.c:269
@@ -10626,15 +10759,12 @@ msgid "Add action"
 msgstr "Pridať akciu"
 
 #: 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 ""
-"Zabudli ste vybrať priečinok.\n"
-"Prosím, vráťte sa a zadajte platný priečinok, kam doručiť poštu."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Zadajte meno súboru:"
 
-#: 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 "Vybrať priečinok"
 
@@ -10647,7 +10777,7 @@ msgstr ""
 "Chyba v regulárnom výraze '%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é"
@@ -10836,224 +10966,228 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "obsahuje"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopírovať do priečinku"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Dátum prijatia"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Dátum odoslania"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Odstránené"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "neobsahuje"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nekončí na"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "neexistuje"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "neexistuje"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "nevyzerá ako"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "nezačína na"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Neexistuje"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Návrh"
 
-#: 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
 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 "bolo pred"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "je označený"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "je viac než"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "je menej než"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nie je"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "nie je označený"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c: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 "Konferencia"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Telo správy"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Hlavička správy"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Presunúť do priečinku"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Vykonať príkaz"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Prehrať 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 "Prečítaná"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Adresáti"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Regul. výraz"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Odpovedaná"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "je viac než"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "je menej než"
+#: filter/libfilter-i18n.h: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 "Skóre"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Nastaviť stav"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Vykonať príkaz"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Veľkosť (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "vyzerá ako"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Zdrojový účet"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Špecifická hlavička"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "začína na"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: 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 "Predmet"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Nastaviť 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
+#, fuzzy
+msgid "does not return"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "nevyzerá ako"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "nezačína 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 "bolo pred"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "je viac než"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "je menej než"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "nie je označený"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "nie je"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "je"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "je viac než"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "je menej než"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "vyzerá ako"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "začína na"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Pravidlá"
@@ -11087,31 +11221,31 @@ msgstr "Musíte zadať aspoň jeden priečinok ako zdrojový."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje vašu starú pošty Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importujem..."
 
-#: 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 "Prosím, čakajte"
 
-#: 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 "Importujem %s ako %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 "Prehľadávam %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 "Pošta"
 
@@ -11172,39 +11306,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 importuje vaše staré dáta 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 "Odpadky"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokálny poštový súbor %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 "Prehľadávam priečinok"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Spúšťam import"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Upraviť 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?"
@@ -11322,26 +11456,36 @@ msgid "Folder containing mail"
 msgstr "Priečinok obsahujúci poštu"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Verejný"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Priečinok obsahujúci poštu"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Virtuálne odpadky"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Virtuálny priečinok s odpadkami"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Tento priečinok nemôže obsahovať správy."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Zmení vlastnosti tohto priečinku"
 
-#: 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."
@@ -11349,79 +11493,80 @@ msgstr ""
 "Niektoré vaše nastavenia pošty vyzerajú ako poškodené. Prosím, skontrolujte, "
 "že je všetko v poriadku."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Nemáte nastavený spôsob prenosu pošty"
 
-#: 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 "Varovanie: Zmenená správa"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Napísať správu"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Nasledujúca správa"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Predchádzajúca správa"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nová správa"
 
-#: 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 "Nie je možné inicializovať poštový komponent Evolution."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nie je možné inicializovať konfiguračný komponent pre poštu Evolution."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Nie je možné inicializovať komponent pre infomácie o priečinkoch 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 "Pripájam sa na server..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Nie je možné zaregistrovať 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: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 "Nie je možné vytvoriť dočasný priečinok: %s"
@@ -11466,141 +11611,141 @@ msgstr "%d poslaných"
 msgid "%d total"
 msgstr "celkovo %d"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: 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 na _konferenciu"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: 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 "_Odpovedať odosielateľovi"
 
-#: 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 "Odpovedať _zoznamu"
 
-#: 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 "Odpovedať _všetkým"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Follow _Up..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Vymazať _značky"
 
 #. 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 "Označiť ako _prečítanú"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Presunúť do priečinka..."
 
-#: 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 "_Kopírovať do priečinku..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Pridať odosielateľa do _adresára"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Použiť filtre"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VPriečinok na konferenciu"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VPriečinok na konferenciu (%s)"
@@ -11673,20 +11818,20 @@ msgstr "Nevyplnili ste všetky povinné informácie."
 msgid "Evolution Account Editor"
 msgstr "Editor účtov 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 "_Hostiteľ:"
 
-#: 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 "Meno po_užívateľa:"
 
-#: 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 "_Cesta:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Nemôžete vytvoriť dva účty s rovnakým menom."
 
@@ -11703,14 +11848,14 @@ msgid "Really delete account?"
 msgstr "Naozaj odstrániť účet?"
 
 #: 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 "Zakázať"
 
 #: 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 "Povoliť"
 
@@ -11799,9 +11944,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 ""
 "Posielate správu formátovanú ako HTML, ale nasledujúci adresáti nechcú "
 "dostávať takto formátovanú poštu:\n"
@@ -11844,7 +11990,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Musíte zadať adresátov pre poslanie tejto správy."
 
-#: mail/mail-callbacks.c: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 ""
 "Nei je možné otvoriť priečinok na koncepty pre tento účet.\n"
 "Chcete použiť štandardný priečinok na koncepty?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Dňa %a, %Y-%m-%d at %H:%M, %%s napísal:"
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: 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 "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Naozaj chcete upraviť všetkých %d správ?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11881,7 +12027,7 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11889,32 +12035,32 @@ msgstr ""
 "Iba správy z priečinku Odoslané je možné\n"
 "znovu poslať."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Žiadna vybraná správa"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Prepísať súbor?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 msgid "Go to next folder with unread messages?"
 msgstr "Prejsť na nasledujúci priečinok s neprečítanými správami?"
 
-#: 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?"
@@ -11922,7 +12068,7 @@ msgstr ""
 "V tomto priečinku už nie sú žiadne nové správy.\n"
 "Chcete prejsť na nasledujúci priečinok?"
 
-#: 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"
@@ -11934,7 +12080,7 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto správy?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11943,64 +12089,64 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\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
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: 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 "Tlač správy zlyhala"
 
-#: 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 "Naozaj chcete otvoriť všetkých %d správ v samostatných oknách?"
 
-#: 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 "Bez popisu"
 
-#: 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 bez mena"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Odoslané"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Pridať kritérium"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Uložiť podpis"
@@ -12060,16 +12206,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca účtom Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Účet"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Kontrolujem 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 "Pripájam sa na server..."
 
@@ -12781,78 +12927,74 @@ msgstr "Nepodarilo sa vytvoriť kontext obálky S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Uložiť prílohu"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nie je možné vytvoriť dočasný súbor '%s': %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Uložiť prílohu"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Zobraziť v texte"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvoriť v %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Zobraziť v text (pomocou %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Skryť"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Externý zobrazovač"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Nahrávať _obrázky"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Načítavam obsah správy"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Úlohy _po termíne:"
 
-#: 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 "Otvoriť odkaz v prehliadači"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopírovať umiestnenie odkazu"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Uložiť odkaz ako"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
@@ -12861,107 +13003,108 @@ msgstr "Uložiť obrázok ako..."
 msgid "Pinging %s"
 msgstr "Prehľadávam %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Neplatná adresa"
 
-#: 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 "Od"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: 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 "Komu"
 
-#: 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 "Pošta"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Táto správa je digitálne podpísaná. Kliknutím na ikonu zámku získate "
 "podrobnosti."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nepodarilo sa vytvoriť kontext overenia 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 "Táto správa je digitálne podpísaná a podpis je platný."
 
-#: 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 "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na 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 "Odkaz na lokálny súbor (%s) platný na serveri \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené dáta (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: 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 "Lokálne priečinky"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Znovu nastavujem priečinok"
 
-#: 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"
@@ -12970,27 +13113,22 @@ msgstr ""
 "Nie je možné uložiť metainformácie priečinku, asi zistíte,\n"
 "že ho nie je možné ani otvoriť: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nie je možné uložiť metainformácie priečinku do %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nie je možné odstrániť metainformácie priečinku %s: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mení priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s nie je možné znovu nastaviť, pretože to nie je lokálny priečinok"
-
-#: 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."
@@ -12998,15 +13136,15 @@ msgstr ""
 "Ak nemôžete otvoriť túto poštovú schránku, potom\n"
 "ju budete musieť opraviť ručne."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Nemôžete zmeniž formát nelokálnych priečinkov."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znovu nastaviť /%s"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "Nemôžete zmeniž formát nelokálnych priečinkov."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13247,21 +13385,21 @@ msgstr "Čakám..."
 msgid "User canceled operation."
 msgstr "Používateľ zrušil operáciu."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Uložiť toto heslo"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Zapamätať si heslo pre zvyšok tohto sedenia"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
@@ -13270,11 +13408,11 @@ msgstr "Zadajte heslo"
 msgid "Could not save signature file: %s"
 msgstr "Nepodarilo sa uložiť súbor podpisu."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Uložiť podpis"
 
-#: 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"
@@ -13284,11 +13422,12 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: 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 podpis:"
 
-#: 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 "Meno:"
 
@@ -13328,7 +13467,7 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: 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 "VPriečinky"
 
@@ -13358,67 +13497,67 @@ msgstr "(Bez predmetu)"
 msgid "%s - Message"
 msgstr "%s - Správa"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Videné"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Nižšia"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Vyššia"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: 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 "Dnes %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %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 "Generujem zoznam správ"
 
@@ -13492,46 +13631,72 @@ msgstr "Odpovedať všetkým"
 msgid "Review"
 msgstr "Ukážka"
 
-#: 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 "Follow Up"
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Dokončený"
+
+#: 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 "Vymazať _značky"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Termín do "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Meno súboru:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Prechádzam priečinky pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Prechádzam koreňové priečinky na \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prihlasujem si priečinok \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasujem sa z priečinku \"%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 "Priečinok"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Uložiť v priečinku..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Nebol vybraný žiadny server"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Prosím, vyberte server."
 
@@ -23434,12 +23599,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Bez popisu"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Súhrn pošty"
 
-#: 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 "Lokálne priečinky"
 
@@ -23449,23 +23614,23 @@ msgstr "Lokálne priečinky"
 #. (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 Slovo dňa"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Citát dňa"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Pridať nový kanál správ"
 
-#: 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 "Zadajte URL nového kanálu správ, ktorý chcete pridať"
 
@@ -23505,11 +23670,11 @@ msgstr "(žiadny popis)"
 msgid "My Weather"
 msgstr "Moje počasie"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr "Nastala chyba pri sťahovaní dát pre"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Počasie"
 
@@ -24836,6 +25001,11 @@ msgstr ""
 "Nie je možné preniesť priečinok:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Otvoriť v %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25077,12 +25247,25 @@ msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
 #: 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 "Zadané meno priečinku nie je platné: %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 ""
+"Nie je možné premenovať priečinok:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25091,12 +25274,12 @@ msgstr ""
 "Zadaný priečinok sa nedá vytvoriť:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Vytvoriť _nový priečinok..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nová..."
 
@@ -25126,20 +25309,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Prosím, vyberte informácie, ktoré chcete importovať:"
 
-#. 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 ""
-"Importujem %s\n"
-"Importér nie je pripravený.\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
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25148,22 +25318,22 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Vybrať priečinok"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Súbor %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
 msgid "Evolution Error"
 msgstr "Chyba 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"
@@ -25173,11 +25343,11 @@ msgstr ""
 "%s\n"
 "nie je k dispozícii importér."
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importujem"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25186,17 +25356,17 @@ msgstr ""
 "Importujem %s\n"
 "Začínam %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Chyba pri štarte %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba pri načítavaní %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25205,31 +25375,31 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Meno súboru:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Vyberte súbor"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Typ súboru:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Importovať dáta a nastavenia zo starších programov"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importovať jeden súbor"
 
-#: 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"
@@ -25237,24 +25407,24 @@ msgstr ""
 "Prosím, čakajte...\n"
 "Hľadám existujúce nastavenie"
 
-#: 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 "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 "Od %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Vyberte cieľový priečinok pre import týchro dát"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
@@ -25282,32 +25452,32 @@ msgstr "Synchronizujem priečinok"
 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 "Otváram priečinok %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 priečinok %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 "Otvoriť v %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 "Nie je možné premenovať priečinok: %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 ""
@@ -25349,44 +25519,44 @@ msgstr "Meno pre priečinok nemôže obsahovať lomítka."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' a '..' sú rezervované mená priečinkov."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Nástroj pre oznamovanie chýb nebol nájdený v $PATH."
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "O Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Prejsť na priečinku..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Vyberte priečinok, ktorý chcete otvoriť"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Vytvorí novú skratku"
 
-#: 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 "Vyberte priečinok, kam má skratka smerovať:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: 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 "_Pracovať off-line"
 
-#: 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 "Pracovať off-line"
 
@@ -25394,27 +25564,27 @@ msgstr "Pracovať off-line"
 msgid "(No folder displayed)"
 msgstr "(Nezobrazený žiadny priečinok)"
 
-#: 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 "(Žiadna)"
 
-#: 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 je momentálne on-line. Stlačením tohto tlačidla prejdete do "
 "módu off-line."
 
-#: 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 prechádza do módu off-line."
 
-#: 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 ""
@@ -25433,12 +25603,12 @@ msgstr ""
 "Chyba z aktivačného systému:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25449,19 +25619,19 @@ msgstr ""
 "neočakávane skončil. Musíte ukončiť Evolution a znovu ju\n"
 "spustiť, aby ste získali prístup k vašim dátam."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Nie je možné zaregistrovať u OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Konfiguračná databáza nenájdená"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
@@ -25601,58 +25771,62 @@ msgstr "Skratky"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Žiadna chyba"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Priečinok s týmto menom už existuje"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Uvedený typ priečinku nie je platný"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 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 "Nedostatok miesta pre vytvorenie priečinku"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Priečinok je prázdny"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Uvedený priečinok nebol nájdený"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funkcia nie je v tomto sklade implementovaná"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operácia nepodporovaná"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Uvedený typ nie je podporovaný týmto skladom"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Uvedený priečinok nie je možné zmeniť alebo odstrániť"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Nepodarilo sa vytvoriť priečinok s týmto menom"
 
+#: 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 (...)"
@@ -25867,9 +26041,10 @@ msgstr ""
 "Stlačením \"Nasledujúci\" môžete spustiť toto nastavenie."
 
 #: 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 ""
@@ -25887,26 +26062,22 @@ msgid "Evolution Import Assistant"
 msgstr "Nástroj Evolution pre import"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Nástroj Evolution pre import"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Import súboru (krok 3 z 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Typ importu (krok 1 z 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Vyberte importér (krok 2 z 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Vyberte súbor (krok 2 z 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"
@@ -26118,10 +26289,10 @@ msgstr "Zobraziť aktuálny 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "A_kcie"
 
@@ -26239,7 +26410,7 @@ msgid "Print this item"
 msgstr "Tlačiť túto položku"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Uložiť"
 
@@ -26266,7 +26437,7 @@ msgstr "Uložiť túto položku na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Súbor"
 
@@ -26348,7 +26519,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Naplánovať stretnutie pre túto položku"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Prispôsobiť moje Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26398,29 +26570,30 @@ msgid "Post a message to a Public folder"
 msgstr "Ukladám správu do priečinku"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Prihlásiť priečinky..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Zobraziť okno s náhľadom správy"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prihlásiť alebo odhlásiť priečinky na vzdialených serveroch"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor virtuálneho priečinku..."
 
-#: 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 "_Náhľad"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_Prihlásiť priečinky..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Zmení vlastnosti tohto priečinku"
@@ -26514,7 +26687,7 @@ msgstr "Zoznam vlákien"
 msgid "_Expunge"
 msgstr "_Vyčistiť"
 
-#: 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 "_Priečinok"
 
@@ -26822,7 +26995,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Hľadá v texte zobrazenej sprá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 "Nastaví stránku pre aktuálnu tlačiareň"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26933,7 +27107,7 @@ msgstr "_Citované"
 msgid "_Resend..."
 msgstr "_Premenovať..."
 
-#: 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 "_Nástroje"
 
@@ -26948,12 +27122,12 @@ msgstr "Zavrie toto okno"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_Zavrieť"
 
 #: 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 "_Pohľad"
 
@@ -27127,7 +27301,7 @@ msgstr "_HTML"
 msgid "Save the current file and close the window"
 msgstr "Uložiť zoznam a zatvoriť dialóg"
 
-#: 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 "_Pomocník"
 
@@ -27294,7 +27468,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Vytvoriť _nový priečinok..."
 
 #: 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
@@ -27311,115 +27485,135 @@ msgid "Pi_lot Settings..."
 msgstr "Nastavenie _pilota..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Nastavenie _pilota..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Vytvoriť _nový priečinok..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Príjem / odoslanie"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Poslať neodoslanú poštu a prijať novú poštu"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Nastavenie pošty"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Nastavenie pošty"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Zobrazí informáciu o Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Pošle správu o chybe"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 "Pošle správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v núdzi."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Prepnúť"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prepne, či sa má zobrazovať panel skratiek"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Prepne, či pracujete on alebo off-line."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Zobraziť vybraný priečinok"
 
-#: 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 "O Ximian _Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "Pru_h priečinkov"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Priečinok"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Prejsť do priečinku..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Presunúť..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nový"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "Nový _priečinok"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "_Neopakovať"
+msgid "_Remove Other User's Folder"
+msgstr "Vytvoriť _nový priečinok..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Poslať / Prijať"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Nastavenie _pošty..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Panel skratiek"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Skratka"
@@ -27659,11 +27853,11 @@ msgstr "Znaková sada"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Editor hľadania"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Uložiť hľadanie"
 
@@ -27743,6 +27937,53 @@ msgstr "init_corba(): Nie je možné inicializovať GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "_Odstrániť"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Pridať"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Hľadám nové správy"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Priečinok je prázdny"
+
+#~ msgid "1 byte"
+#~ msgstr "1 bajt"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u bajtov"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Zabudli ste vybrať priečinok.\n"
+#~ "Prosím, vráťte sa a zadajte platný priečinok, kam doručiť poštu."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s nie je možné znovu nastaviť, pretože to nie je lokálny priečinok"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importujem %s\n"
+#~ "Importér nie je pripravený.\n"
+#~ "Čakám 5 sekúnd a skúsim to znovu."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Nástroj Evolution pre import"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "_Neopakovať"
+
 #~ msgid "Error in search expression."
 #~ msgstr "Chyba v hľadanom výraze."
 
@@ -27787,15 +28028,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "Bez účasti"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Táto správa nebola odoslaná.\n"
-#~ "\n"
-#~ "Chcete uložiť zmeny?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (štandard)"
@@ -28132,14 +28364,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgstr "Odstrániť všetko okrem podpisu"
 
 #, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML podpis:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Meno súboru:"
-
-#, fuzzy
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML podpis:"
 
@@ -28170,14 +28394,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "Riga"
 #~ msgstr "Riga"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Pridať"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "Odstrániť"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Naozaj chcete odstrániť priečinok \"%s\"?"
 
@@ -28264,12 +28480,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Nepodarilo sa nájsť žiadnu z vašich identít v zozname účastníkov!\n"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Informácie o voľnom čase (%s do %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "Informácie iCalendar"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Neplatný typ v body-contains, očakávam reťazec"
 
@@ -28547,9 +28757,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "Ú_loha..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "Nastavenie _pošty..."
-
 #~ msgid "_Apply Filters"
 #~ msgstr "_Použiť filtre"
 
diff --git a/po/sl.po b/po/sl.po
index 34e2f398cc..e2058059cf 100644
--- a/po/sl.po
+++ b/po/sl.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: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -318,11 +318,17 @@ msgstr "Družinsko ime"
 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 "Neimenovan seznam stikov"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Več vVizitk"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VVizitka za %s"
@@ -333,47 +339,47 @@ msgstr "VVizitka za %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 "Nisem mogel inicializirati Bonoba"
 
-#: 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 "Iščem..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Nalagam..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Vzpostavljam povezavo s strežnikom LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Dodajam vizitko v strežnik LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Odstranjujem vizitko iz strežnika 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 "Spreminjam vizitko iz strežnika LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Dobivam rezultate iskanja LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr "Napaka ob iskanju"
 
@@ -390,13 +396,13 @@ msgid "EBook not loaded\n"
 msgstr "EKnjiga ni naložena\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati strežnika wombat"
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
@@ -466,10 +472,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Tovarna za vzorčno kontrolo adresarja"
 
 #: 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 "Stiki"
@@ -486,28 +492,38 @@ msgstr "Strežnik LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Strežnik LDAP, ki vsebuje podatke o stikih"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Stiki"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Mapa, ki vsebuje podatke o stikih"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Nov stik"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Stik"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Ustvari nov stik"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "Seznam _stikov"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Ustvari nov seznam stikov"
@@ -556,7 +572,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
 
 #: 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 "Nisem mogel inicializirati gnome-vfs"
 
@@ -564,11 +580,11 @@ msgstr "Nisem mogel inicializirati gnome-vfs"
 msgid "Other Contacts"
 msgstr "Drugo stiki"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: 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."
@@ -576,7 +592,7 @@ msgstr ""
 "Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
 "pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -586,7 +602,7 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c: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"
@@ -598,7 +614,7 @@ msgstr ""
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\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,37 +624,50 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c: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 ""
+"Strežniku IMAP se nisem mogel avtentificirati.\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 "Vpišite geslo za %s (uporabnik %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. 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 "Katerokoli polje vsebuje"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: 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"
@@ -646,7 +675,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"
@@ -654,25 +683,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 "katerakoli kategorija"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -740,53 +769,53 @@ msgstr "_Preveri za podprte vrste  "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Možnosti"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr " _Odstrani"
-
-#: 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
 #, 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 "<< odstrani"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Možnosti"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -927,50 +956,56 @@ msgstr "Ena"
 
 #: 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 "Privzeto"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Privzeto"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "_Doseg iskanja:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h: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 "Iskanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Izberi vse"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Zbrisano"
 
-#: 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,48 +1025,48 @@ 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 "Podatki o izvorni kodi"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: 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 "Piskaj ob zaslonskih alarmih"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Shranjena iskanja"
 
-#: 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"
@@ -1039,7 +1074,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"
@@ -1048,7 +1083,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"
@@ -1056,7 +1091,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"
@@ -1066,7 +1101,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"
@@ -1076,13 +1111,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 "
@@ -1092,7 +1127,7 @@ msgstr ""
 "To je največje število vizik za prenos.  Če je to nastavljeno na preveč, bo "
 "upočasnilo ta adresar."
 
-#: addressbook/gui/component/ldap-config.glade.h: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 "
@@ -1102,7 +1137,7 @@ msgstr ""
 "boste to nastavili na \"E-poštni naslov\", bo potrebovan anonimni dostop do "
 "vašega strežnika LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h: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 "
@@ -1112,7 +1147,7 @@ msgstr ""
 "To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
 "prikaz."
 
-#: 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"
@@ -1120,11 +1155,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"
@@ -1133,26 +1168,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 "Razločno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "E-poštni naslov"
 
-#: 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 "Kadar je možno"
 
-#: 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
@@ -1160,51 +1195,51 @@ msgstr "Kadar je možno"
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
-msgstr "Dodaj >>"
+msgid "_Add ->"
+msgstr "_Dodaj"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Dodaj dejanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Dodaj dejanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Vedno"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Zbriši vse"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Prikaz"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Razločno ime (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 "_Omejitev prenosov"
 
-#: 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
@@ -1214,103 +1249,103 @@ msgstr "_Omejitev prenosov"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Uredi sestanek"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Alarm Evolucije"
 
-#: 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 "_Možnosti"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "Številka vrat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Privzeto"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "Ime _strežnika:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Čas podaljška spanja (minut)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Račun %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Znova se povezujem z %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 "Splošno"
 
-#: 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 "Iskanje"
@@ -1325,8 +1360,8 @@ msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
 
 #. 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 +1392,11 @@ msgstr "(%d ni pokazanih)"
 msgid "Unnamed Contact"
 msgstr "Neimenovan stik"
 
-#: 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 "Izberi stike iz adresarja"
 
-#: 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 "Poišči stik"
@@ -1435,7 +1470,7 @@ msgid "D_epartment:"
 msgstr "O_ddelek:"
 
 #: 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"
 
@@ -1494,13 +1529,13 @@ msgstr "Želi dobivati _HTML e-pošto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c: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 "_Zbriši"
 
@@ -1528,1024 +1563,1024 @@ msgstr "URL _javnega koledarja"
 msgid "_Web page address:"
 msgstr "Naslov _spletne strani:"
 
-#: 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 "Združene države amerike"
 
-#: 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 "Albanija"
 
-#: 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žirija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Ameriška Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "Andora"
 
-#: 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 "Angvila"
 
-#: 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 "Antigva in 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 "Armenija"
 
-#: 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 "Australija"
 
-#: 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 "Avstrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbajdžan"
 
-#: 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 "Bahami"
 
-#: 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 "Bahrajn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladeš"
 
-#: 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 "Belorusija"
 
-#: 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 "Belgija"
 
-#: 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 "Bermudi"
 
-#: 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 "Bolivija"
 
-#: 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 "Bosna in Hercegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Bocvana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "Bouvetski otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brazilija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "Britansko Indijsko oceansko območje"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c: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 "Bolgarija"
 
-#: 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 "Zelenortski otoki"
 
-#: 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 "Kajmanski otoki"
 
-#: 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 "Srednjaafriška republika"
 
-#: 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 "Čile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Kitajska"
 
-#: 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 "Velikonočni otok"
 
-#: 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 "Kokosovi otoki"
 
-#: 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 "Kolumbija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Komori"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c: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 "Cookovi otoki"
 
-#: 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 "Kostarika"
 
-#: 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 "Cote 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 "Hrvaška"
 
-#: 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 "Ciper"
 
-#: 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 "Češka"
 
-#: 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 "Danska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Džibuti"
 
-#: 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 "Dominikanska republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Vshodni timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c: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 "Egipt"
 
-#: 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 "Ekvatorijalna gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritreja"
 
-#: 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 "Estonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklandski otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Farski otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c: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 "Finska"
 
-#: 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 "Francija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Francoska Gvajana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Francoska polinezija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Francoska ju>na obmohja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c: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 "Gambija"
 
-#: 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 "Gruzija"
 
-#: 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 "Nemčija"
 
-#: 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 "Gibrlaltar"
 
-#: 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čija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grenlandija"
 
-#: 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 "Gvatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Gvineja bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Gvajana"
 
-#: 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 "Heardovi in McDonaldovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "Sveto morje"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c: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 "Madžarska"
 
-#: 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 "Islandija"
 
-#: 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 "Indija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: 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 "Irska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Izrael"
 
-#: 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 "Italija"
 
-#: 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 "Jamajka"
 
-#: 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 "Japonska"
 
-#: 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 "Jordanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazahstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Kenija"
 
-#: 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 "Koreja, Republika"
 
-#: 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 "Kuvajt"
 
-#: 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 "Latvija"
 
-#: 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 "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 "Liberija"
 
-#: 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 "Litvanija"
 
-#: 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 "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Makedonija"
 
-#: 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 "Malavi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malezija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Maldivi"
 
-#: 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 "Marshallovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "Martinik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "Mavretanija"
 
-#: 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 "Mehika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Mikronezija"
 
-#: 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 "Moldova, Republika"
 
-#: 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 "Mongolija"
 
-#: 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 "Mozambik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Mjanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Namibija"
 
-#: 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 "Nizozemska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Nizozemski Antili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Nova Kaledonija"
 
-#: 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 "Nova Zelandija"
 
-#: 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 "Nikaragva"
 
-#: 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 "Nigerija"
 
-#: 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 "Norfolški otoki"
 
-#: 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 "Severni marianski otoki"
 
-#: 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ška"
 
-#: 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 "Paragvaj"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "Palestinsko osvobojeno ozemlje"
 
-#: 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 Nova Gvineja"
 
-#: 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 "Paragvaj"
 
-#: 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 "Filipini"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "Pitcairin"
 
-#: 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 "Poljska"
 
-#: 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 "Portugalska"
 
-#: 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 "Portoriko"
 
-#: 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 "Romunija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Ruska federacija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c: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 "St. Kitts in 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. Lucija"
 
-#: 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 "St. Vincent in Grenadini"
 
-#: 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 in 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 "Savdska Arabija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Senegalija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Sejšeli"
 
-#: 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 "Slovaška"
 
-#: 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 "Slovenija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Solomonovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somalija"
 
-#: 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 "Južno afriška republika"
 
-#: 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 "Južna Georgija in Južni Sandwichovi otoki"
 
-#: 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 "Španija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Šrilanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "Sv. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "Sv. Pierre in Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c: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 "Svalbardovi in Jan Mayenovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Svazi"
 
-#: 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 "Švedska"
 
-#: 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 "Švica"
 
-#: 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 "Tajvan"
 
-#: 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
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzanija, Združena republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Tajska"
 
-#: 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 "Tongo"
 
-#: 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 in Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunizija"
 
-#: 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 "Turčija"
 
-#: 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 "Otočji Turks in 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 "Ukrajina"
 
-#: 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 "Združeni arabski emirati"
 
-#: 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 "Velika Britanija"
 
-#: 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 "Ameriški zunajležeči otoki"
 
-#: 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 "Urugvaj"
 
-#: 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 "Britanski deviški otoki"
 
-#: 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 "Ameriški deviški otoki"
 
-#: 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 "Wallisovi in Futunini otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Zahodna 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 "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 "Jugoslavija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Zambija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
@@ -2582,20 +2617,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisem mogel najti gradnika za polje `%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 "Hitro dodaj stik"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Uredi celoto"
 
-#: 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 "Polno ime"
 
-#: 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-pošta"
 
@@ -2617,6 +2652,19 @@ msgstr ""
 "%s že obstaja\n"
 "Jo želite prepisati?"
 
+#: 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 "Prepiši datoteko?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Naslov _2:"
@@ -2747,7 +2795,7 @@ msgstr "Urejevalnik stikov"
 msgid "Contact List Editor"
 msgstr "Urejevalnik stikov"
 
-#: 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 "Shrani kot vVizitko"
 
@@ -2797,7 +2845,7 @@ msgstr ""
 "obstaja v tej mapi. Ga želite vseeno dodati?"
 
 #: 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 "Napredno iskanje"
 
@@ -2806,24 +2854,24 @@ msgstr "Napredno iskanje"
 msgid "Search"
 msgstr "Iskanje"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 vizitka"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 msgid "Error getting book view"
 msgstr "Napaka ob dobivanju pogleda knjige"
 
-#: 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"
@@ -2835,10 +2883,10 @@ msgid "Success"
 msgstr "Uspeh"
 
 #: 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 "Neznana napaka"
 
@@ -2846,7 +2894,7 @@ msgstr "Neznana napaka"
 msgid "Repository offline"
 msgstr "Skladišče, ki ni na mreži"
 
-#: 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 "Nimate dovoljenja"
@@ -2867,8 +2915,8 @@ msgstr "Protokol ni podprt"
 #: 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 "preklicano"
 
@@ -2919,7 +2967,7 @@ msgstr "Napaka ob odstranjevanju seznama"
 
 #: 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 "Napaka ob odstranjevanju vizitke"
 
@@ -2932,11 +2980,10 @@ msgid "Display Cards"
 msgstr "Prikaži vizitke"
 
 #: 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 ""
 "Zahtevali ste prikaz %d vizitk. To bo povzročilo odprtje %d novih oken na \n"
 " vašem zaslonu. Resnično želite prikazati vse te vizitke?"
@@ -3024,7 +3071,7 @@ msgstr "Adresar"
 
 #: 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 "Shrani kot vVizitko"
@@ -3108,7 +3155,7 @@ msgstr "Kopiraj"
 msgid "Paste"
 msgstr "Prilepi"
 
-#: 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 "Prilepi"
 msgid "Delete"
 msgstr "Zbriši"
 
-#: 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 "_Trenutni pogled"
@@ -3126,7 +3173,7 @@ msgstr "_Trenutni pogled"
 #. 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"
@@ -3270,7 +3317,7 @@ msgid "Include:"
 msgstr "Vključi:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Ležeče"
 
@@ -3295,7 +3342,7 @@ msgid "Options"
 msgstr "Možnosti"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Usmerjenost"
 
@@ -3318,7 +3365,7 @@ msgstr "Vir papirja:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Pokončno"
 
@@ -3380,20 +3427,20 @@ msgstr "Neimenovan sestanek"
 
 #: 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 "visoka"
 
 #: 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 "običajna"
 
 #: 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 "nizka"
 
@@ -3404,13 +3451,17 @@ msgstr "nizka"
 msgid "Undefined"
 msgstr "ni definirana"
 
-#: 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 "Napaka ob komuniciranju s strežnikom koledarja"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/calendar/calendar-conduit.c:1300
+#: calendar/conduits/calendar/calendar-conduit.c:1372
+#: calendar/conduits/calendar/calendar-conduit.c:1375
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
@@ -3519,11 +3570,11 @@ msgstr "Čas podaljška spanja (minut)"
 msgid "_Edit appointment"
 msgstr "_Uredi sestanek"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Opis ni na voljo."
 
-#: 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 ""
 "bilo nastavljeno, da pošlje e-pošto. Evolucija bo\n"
 "prikazala običajen opozorilni dialog."
 
-#: 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 "Opozorilo"
 
-#: 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 "
@@ -3558,15 +3609,15 @@ msgstr ""
 "\n"
 "Ste prepričani, da želite pognati ta 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 "O tem programu me ne sprašuj več."
 
-#: 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 "Nisem mogel inicializirati GNOMEa"
 
-#: 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 "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
@@ -3615,7 +3666,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 ""
@@ -3694,9 +3745,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
@@ -3713,13 +3764,13 @@ msgid "Assigned"
 msgstr "Določena"
 
 #: 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 "Da"
 
 #: 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 "Ne"
 
@@ -3739,76 +3790,96 @@ msgstr "Tedenski pogled"
 msgid "Month View"
 msgstr "Mesečni pogled"
 
-#: 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 "Koledar"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Mapa, ki vsebuje sestanke in dogodke"
 
-#: 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 _javnega koledarja"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Mapa, ki vsebuje sestanke in dogodke"
+
+#: 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 "Naloge"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Mapa, ki vsebuje predmete za opravit"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Natisni naloge"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Mapa, ki vsebuje predmete za opravit"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Ustvari nov sestanek"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 msgid "Create a new meeting request"
 msgstr "Ustvari nov zahtevek za sestanek"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Nova naloga"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Naloga"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ustvari nov sestanek"
@@ -3852,29 +3923,30 @@ msgid "Alarm Repeat"
 msgstr "Ponovitev alarma"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
+#, fuzzy
+msgid ""
+"Evolution does not yet support email notification for reminders.  You will "
+"not be able to edit the options for this reminder."
+msgstr ""
+"To je opozorilo preko elektronske pošte, ki pa ga Evolucija še ne podpira. "
+"Ne boste mogli spremeniti možnosti za to opozorilo."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Sporočila za prikaz"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Predvajaj zvok:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Ponovi alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Poženi program:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid ""
-"This is an email reminder, but Evolution does not yet support this kind of "
-"reminders.  You will not be able to edit the options for this reminder."
-msgstr ""
-"To je opozorilo preko elektronske pošte, ki pa ga Evolucija še ne podpira. "
-"Ne boste mogli spremeniti možnosti za to opozorilo."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "S temi argumenti:"
@@ -3898,110 +3970,110 @@ msgstr "ur"
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 dan"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d tednov"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 teden"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d ur"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 ura"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: 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 "Predvajaj zvok"
 
-#: 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 "Kaži sporočilo"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Pošlji e-pošto"
 
-#: 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 "Poženi program"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Izvršena bi moralo biti neznano dejanje"
 
-#: 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 pred pričetkom sestanka"
 
-#: 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 pričetku sestanka"
 
-#: 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 ob pričetku sestanka"
 
-#: 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 pred koncem sestanka"
 
-#: 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 koncu sestanka"
 
-#: 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 koncu sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s ob %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 za neznano vrsto sprožilca"
@@ -4022,7 +4094,7 @@ msgstr "Opomnilniki"
 
 #: 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 "Povzetek:"
 
@@ -4106,7 +4178,7 @@ msgid "Days"
 msgstr "Dni"
 
 #: 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 "petek"
 
@@ -4119,7 +4191,7 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: 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 "ponedeljek"
 
@@ -4129,7 +4201,7 @@ msgid "S_un"
 msgstr "_ned"
 
 #: 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 "sobota"
 
@@ -4142,7 +4214,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Kaži številke tednov v navigatorju po dnevih"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -4161,7 +4233,7 @@ msgid "Task List"
 msgstr "Seznam _nalog"
 
 #: 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 "četrtek"
 
@@ -4178,7 +4250,7 @@ msgid "Time format:"
 msgstr "Oblika izpisa časa:"
 
 #: 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 "torek"
 
@@ -4187,7 +4259,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 "sreda"
 
@@ -4411,8 +4483,8 @@ msgid "No summary"
 msgstr "Ni povzetka"
 
 #: 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 "Shrani kot..."
 
@@ -4481,27 +4553,27 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: 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 "Sestanek"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Opomnilnik"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: 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 "Načrtovanje časa"
 
-#: 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 "Sestanek"
 
@@ -4570,19 +4642,19 @@ msgstr "_Čas konca:"
 msgid "_Start time:"
 msgstr "_Čas pričetka:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Potreben je organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Potreben je vsaj en udeleženec."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Ta oseba se je že udeleženec sestanka!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Delegiraj komu..."
 
@@ -4622,7 +4694,7 @@ msgid "Member"
 msgstr "Član"
 
 #: 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"
@@ -4634,7 +4706,7 @@ msgstr "Vloga"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
@@ -4710,47 +4782,47 @@ msgstr "4."
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ta sestanek vsebuje ponovitve, ki jih Evolucija ne zna urejati."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 msgid "first"
 msgstr "prvi"
 
-#: 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 "sekunda"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "ta"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "sever"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "seznam"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Drugi 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 "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "pojavitve"
 
@@ -4843,7 +4915,7 @@ msgstr "Končano dne:"
 
 #: 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 "Potrebuje dejanje"
 
@@ -4852,7 +4924,7 @@ msgid "Progress"
 msgstr "Napredek"
 
 #: 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:"
 
@@ -4864,17 +4936,17 @@ msgstr "_Prioriteta:"
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Osnove"
 
-#: 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 "Dodelitev"
 
-#: 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:"
@@ -4944,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 "Brišem izbrane predmete"
 
-#: 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 "_Odpri"
@@ -4959,30 +5031,30 @@ msgstr "_Odpri"
 msgid "_Save as..."
 msgstr "Shrani kot..."
 
-#: 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 "Na_tisni..."
 
-#: 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 "_Izreži"
 
-#: 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 "_Kopiraj"
 
-#: 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"
@@ -5011,12 +5083,12 @@ msgstr "_Označi opravila kot opravljena"
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: 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 "Posodabljam predmete"
 
-#: 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 "Kliknite tu za dodajanje opravila"
@@ -5025,8 +5097,8 @@ msgstr "Kliknite tu za dodajanje opravila"
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: 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 "Končano"
 
@@ -5055,7 +5127,7 @@ msgid "Start Date"
 msgstr "Datum pričetka"
 
 #: 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 "Povzetek"
@@ -5122,123 +5194,123 @@ msgstr "dop"
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Nov _sestanek"
 
-#: 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 "Nov celodnevni _dogodek"
 
-#: 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 "Nov sestanek"
 
-#: 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 "Nova _naloga"
 
-#: 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 "Natisni..."
 
-#: 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 "Pojdi na _danes"
 
-#: 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 "_Pojdi na 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 "_Objavi podatek o zasedenosti"
 
-#: 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 "Nastavi mapo..."
 
-#: 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 "Nastavi mapo..."
 
-#: 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 "_Shrani kot..."
 
-#: 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 "_Načrtuj sestanek"
 
-#: 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 "Posreduj naprej kot i_Koledar"
 
-#: 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 "Naredi to pojavitev _prestavljivo"
 
-#: 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 "Zbriši to _pojavitev"
 
-#: 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 "Zbriši _vse pojavitve"
 
-#: 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 "Orodja GNOME Pilot niso nameščena na vašem sistemu."
 
-#: 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 "Napaka ob izvajanju %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 "Konec: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "končano "
 
-#: 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 "Podatki o iKoledarju"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "Napaka iKoledarja"
 
-#: 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 "neznana oseba"
 
 #. 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 +5318,332 @@ msgstr ""
 "<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega "
 "menuja."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Nič</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "_Lega:"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "Stanje:"
 
-#: 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 "Sprejeto"
 
-#: 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 "Poskusno sprejeto"
 
-#: 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 "Zavrnjeno"
 
-#: 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 "neznano"
 
-#: 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 "Izberi dejanje:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Posodobi"
 
-#: 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 "V redu"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Poskusno sprejmi"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Pošlji podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Osveži stanje respondenta"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Pošlji zadnje podatke"
 
-#: 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 "Prekliči"
 
-#: 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> je izdal(a) podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Podatki o sestanku"
 
-#: 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> zahteva vašo prisotnost na sestanku."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Predlog sestanka"
 
-#: 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> vas želi dodati k obstoječem sestanku."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Posodobitev sestanka"
 
-#: 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> želi dobiti najnovejše podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Zahtevek za posodobitev sestanka"
 
-#: 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> je odgovoril(a) na zahtevek po sestanku."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Odgovor na sestanek"
 
-#: 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> je preklical(a) sestanek."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Preklic sestanka"
 
-#: 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> je poslal(a) nerazumljivo sporočilo."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Nerazumljivo sporočilo o sestanku"
 
-#: 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> je objavil(a) podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Podatki o nalogi"
 
-#: 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> zahteva, da opravite nalogo."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Predlog naloge"
 
-#: 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> vas želi dodati k obstoječi nalogi."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Posodobitev naloge"
 
-#: 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> želi dobiti najnovejše podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Zahtevek za posodobitev naloge"
 
-#: 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> je odgovoril(a) na dodelitev naloge."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Odgovor na nalogo"
 
-#: 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> je preklical(a) nalogo."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Preklic naloge"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Nerazumljivo sporočilo o nalogi"
 
-#: 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> je objavil(a) podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Podatek o zasedenosti"
 
-#: 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> zahteva vaše podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: 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> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Odgovor zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Nerazumljivo sporočilo o zasedenosti"
 
-#: 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 "Zdi se, da sporočilo ni pravilno oblikovano"
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "To sporočilo vsebuje le nepodprte zahtevke."
 
-#: 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 "Priloga ne vsebuje veljavnega sporočila koledarja"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "Priloga nima gledljivih predmetov koledarja"
 
-#: 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 "Napaka ob prenašanju podatkov za"
 
-#: 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 "Predmeta ni bilo mogoče poslati!\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 "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\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 "Stanja udeleženca ni bilo možno posodobiti, ker predmet ne obstaja več"
 
-#: 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 ""
 "Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\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 "Nisem mogel odpreti imenika v `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: 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 "Predmet poslan!\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 "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Izberi mapo"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Izberi mapo"
@@ -5611,7 +5689,7 @@ msgstr "začetni-datum"
 msgid "Chair Persons"
 msgstr "Predsedujoči"
 
-#: 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 "Potrebni udeleženci"
 
@@ -5625,52 +5703,52 @@ msgid "Resources"
 msgstr "Vir"
 
 #: 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 "Individualno"
 
 #: 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 "Skupina"
 
 #: 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 "Vir"
 
 #: 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 "Soba"
 
 #: 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 "Stol"
 
 #: 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 "Potrebni udeleženci"
 
 #: 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 "Možni sodelujoči"
 
 #: 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 "Ne-sodelujoči"
 
 #: 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 "Poskusno"
 
 #: 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 "Delegirano"
 
@@ -5760,42 +5838,49 @@ msgstr "Čas pričetka sestanka:"
 msgid "Meeting _end time:"
 msgstr "Čas zaključka sestanka:"
 
-#: 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 "Odpiram naloge v %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 "Nisem mogel naložiti nalog 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 "Postopek potreben za naložitev `%s' ni podprt"
 
-#: 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 "Nisem mogel odpreti imenika 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 "Napaka ob zagonu %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
@@ -5809,7 +5894,13 @@ msgstr "Nisem mogel odpreti imenika v `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: 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 "Alarmi ob %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5817,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"
@@ -5825,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 "Odpiram koledar v %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Odpiram mapo %s"
@@ -5891,47 +5982,56 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Potreben je vsaj en udeleženec"
-
-#: 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 "Organizator mora biti naveden."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Potreben je vsaj en udeleženec"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Podatki o dogodku"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Podatki o dnevniku"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Podatki o zasedenosti"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Podatki o kodledarju"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr "Posodobljen"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr "Osveži"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr "Proti-predlog"
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Podatki o zasedenosti (%s do %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "Podatki o iKodledarju"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleženec dogodka."
 
@@ -6167,7 +6267,7 @@ msgid "Print Calendar"
 msgstr "Natisni koledar"
 
 #: 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 "Predogled tiskanja"
@@ -6191,7 +6291,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "URI mape nalog, ki naj se kaže"
 
-#: 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"
@@ -6203,12 +6303,12 @@ msgstr ""
 " \n"
 "Resnično zbriši te naloge? "
 
-#: 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 sprašuj me več."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 msgid "Print Tasks"
 msgstr "Natisni naloge"
 
@@ -6278,17 +6378,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Nisem se mogel povezati s hrambo: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Opomnilnik"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Sporočilo koledarja"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6297,83 +6397,83 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Pine.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 msgid "Gnome Calendar"
 msgstr "Gnome Koledar"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time pričakuje 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 pričakuje, da je 1. argument niz"
 
-#: 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. argument make-time mora biti niz ISO 8601 datuma/časa"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day pričakuje 2 argumenta"
 
-#: 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 pričakuje, da je 1. argument 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 pričakuje, da je 2. argument celo število (integer)"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin pričakuje 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 pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end pričakuje 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 pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 2. argument time_t"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? pričakuje, da je 2. argument niz"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6381,11 +6481,11 @@ msgstr ""
 "contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
 "\" (povzetek), \"description\"(opis)"
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? pričakuje vsaj 1 argument"
 
-#: calendar/pcs/query.c: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)"
@@ -6393,23 +6493,28 @@ msgstr ""
 "has-categories? pričakuje, da so vsi argumenti nizi ali da je natanko en "
 "argument boolean neresničen (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? pričakuje 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? pričakuje, da je 1. argument 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 ""
 "Izračun iskalnega izraza ni podal vrednosti resnično/neresnično (boolean)"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Drugačna napaka"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8003,81 +8108,81 @@ msgstr "Odstranjujem mapo %s"
 msgid "You must be working online to complete this operation"
 msgstr "Za dokončanje te operacije morate delati z mrežo"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: 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 "Napaka ob razčlenjanju filtra: %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 "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporočila"
 
-#: 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 "Nauspeh ob sporočilu %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 "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Nisem uspel prenesti sporočila"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neveljavni argumenti"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neveljavni argumenti"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nisem mogel ustvariti cevi do %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 "Nisem uspel predpomniti sporočila %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 "Napaka ob izvajanju iskanja s filtrom: %s: %s"
@@ -8124,11 +8229,11 @@ msgstr "Nepodprto dejanje: iskanje z izrazom: za %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodprto dejanje: iskanje po uid-jih: za %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Prestavljam sporočila"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Kopiram sporočila v %s"
@@ -8456,7 +8561,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 "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -8513,52 +8618,52 @@ msgstr "Avtentifikacija POP pred SMTP z uporabo ne-pop vira"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabniškega imena"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Razvozlujem: %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 "Napaka ob poizvedbi imena: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Razvozlujem: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
@@ -8757,7 +8862,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"
@@ -8770,11 +8875,11 @@ msgstr ""
 "Prstni odtis:      %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 "V REDU"
 
-#: 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 "SLABO"
 
@@ -8796,7 +8901,7 @@ msgstr ""
 "Ga želite vseeno sprejeti?"
 
 #. 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"
@@ -8851,68 +8956,76 @@ msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
 
-#: 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 "Operacija razveljavljena"
 
-#: 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 "Povezava s strežnikom je bila nepričakovano prekinjena: %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 "Nepričakovan odgovor strežnika IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Odgovor strežnika se je prehitro končal."
 
-#: 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 "Odgovor strežnika IMAP ni vseboval podatkov %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 "Nepričakovan odgovor OK strežnika 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 "Nisem mogel ustvariti imenika %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 "Nisem mogel naložiti povzetka za %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 "Mapa je bila uničena in na novo ustvarjena na strežniku."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Pregledujem za spremenjenimi sporočili"
 
-#: 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 "Nisem uspel prenesti sporočila"
 
-#: 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
@@ -8928,28 +9041,24 @@ msgstr ""
 "Ne morem dobiti sporočila: %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 "Ni takšnega sporočila"
 
-#: 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 "To sporočilo trenutno ni na voljo"
 
-#: 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 "Prenašam povzetke novih sporočil"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Pregledujem za novimi sporočili"
-
-#: 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 "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 
@@ -8966,6 +9075,11 @@ msgstr "Nisem mogel odpreti predpomnilniškega imenika: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Preverjam za novo pošto"
@@ -9012,73 +9126,68 @@ msgstr "Geslo"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "storitev %s za %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c: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 "Povezava prekinjena"
 
-#: 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 "Nisem se mogel povezati z %s (vrata %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 "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %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 "Razširitev SSL/TLS ni podprta"
 
-#: 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 "Pogajanje SSL ni uspelo"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Mapa ni prazna"
-
-#: 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 "Strežnik IMAP %s ne podpira zahtevanega načina avtentifikacije %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 "Ni podpore za način avtentifikacije %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 "%sProsim vpišite geslo IMAP za %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 "Nistve vpisali gesla."
 
-#: 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"
@@ -9089,24 +9198,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 "Ni takšne mape %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 "Ime mape ne more vsebovati znaka 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 "Neznana napaka: %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 "Starševski mapi ni dovoljeno vsebovati podmape"
 
@@ -9183,8 +9292,8 @@ msgstr ""
 "Za branje in shranjevanje krajevne pošte v običajnih Unix mbox datotekah"
 
 #: 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 "Korenski imenik shrambe %s ni absolutna pot"
@@ -9196,7 +9305,7 @@ msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 
 #: 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 morem dobiti mape: %s: %s"
@@ -9210,32 +9319,32 @@ msgstr "Krajevno shrambe nimajo vhodnega predala"
 msgid "Local mail file %s"
 msgstr "Krajevna datoteka s pošto %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 "Nisem mogel preimenovati mape %s v %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 "Nisem mogel preimenovati mape: %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 "Nisem mogel zbrisati datoteke povzetka mape `%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 "Nisem mogel zbrisati datoteke kazala mape `%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 "Nisem mogel odpreti povzetka: %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 "Ne morem dodati sporočila k povzetku: razlog neznan"
 
@@ -9255,6 +9364,7 @@ msgstr "Neveljavna vsebina sporočila"
 
 #: 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"
@@ -9266,12 +9376,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 "Mapa `%s' ne obstaja."
 
 #: 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"
@@ -9297,7 +9409,8 @@ msgid "not a maildir directory"
 msgstr "ni imenik vrste 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 "Nisem mogel prebrati mape `%s': %s"
@@ -9327,7 +9440,7 @@ msgid "Storing folder"
 msgstr "Shranjujem mapo"
 
 #: 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 "Ne morem ustvariti ključavnice na mapi: %s: %s"
@@ -9496,40 +9609,45 @@ msgstr "`%s' ni imenik."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne morem odpreti poštnega imenika 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 "Map vrste 'spool' ni možno preimenovati"
 
-#: 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 "Korenski imenik shrambe %s ni običajnen imenik"
 
-#: 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 "Mapa `%s/%s' ne obstaja."
 
-#: 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' ni običajna datoteka."
+
+#: 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 "Datoteka vrste 'spool' s pošto %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 "Map vrste 'spool' ni možno preimenovati"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Map vrste 'spool' ni možno preimenovati"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Map vrste 'spool' ni možno zbrisati."
 
@@ -9621,47 +9739,47 @@ msgstr "Uporabite preklic"
 msgid "Operation failed: %s"
 msgstr "Operacija ni uspela: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Prenašam povzetek 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 "Uporabnik je preklical"
 
-#: 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 "Ne morem dobiti povzetka POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Uničujem zbrisana sporočila"
 
-#: 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 "Ni sporočila z uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Prenašam sporočilo 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 "Ne morem dobiti sporočila %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Neznan razlog"
 
@@ -9931,41 +10049,41 @@ msgstr "Začasna napaka avtentifikacije"
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Napaka v odgovoru na 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 "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %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 "zdi se, da strežnik n e podpira 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 "Zahtevek STARTTLS je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 msgid "STARTTLS response error"
 msgstr "Napaka v odgovoru na 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 "Strežnik SMTP %s ne podpira zahtevanega načina avtentifikacije %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 "%sProsim vpišite geslo SMTP za %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"
@@ -9976,90 +10094,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 "Strežnik 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 "Dostava pošte s SMTP preko %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 morem poslati sporočila: naslov pošiljatelja ni veljaven."
 
-#: 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 "Pošiljam sporočilo"
 
-#: 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 morem poslati sporočila: ni naslovnikov."
 
-#: 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 morem poslati sporočila: eden ali več neveljavnih naslovnikov"
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "Pozdrav 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 "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Napaka v odgovoru na RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "Avtentifikacija SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta 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 "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\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 ""
 "Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Napaka v ogovoru na 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 ""
 "Zahtevek RCPT TO je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: 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> ni uspel"
 
-#: 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 ""
@@ -10068,78 +10186,69 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr "Napaka v odgovoru na 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 ""
 "Zahtevek DATA je prekoračil časovno omejitev: konec sporočila: %s: pošta ni "
 "bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "Napaka v odgovoru za končanje 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 "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "Napaka v odgovoru na 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 "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "Napaka v odgovoru na QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 bajt"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u bajtov"
-
-#: 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 "priloga"
 
-#: 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 "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
@@ -10171,7 +10280,7 @@ msgstr "Vrsta MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
@@ -10182,45 +10291,45 @@ msgstr "Kliknite tu za adresar"
 #. * 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 "Odgovori-na:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: 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 "Vnesite naslove, ki bodo prejeli, karbonske kopije sporočila"
 
-#: 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."
@@ -10231,12 +10340,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 "Brez opisa"
@@ -10251,7 +10360,7 @@ msgstr "Priloži datoteko"
 msgid "Could not create a PGP signature context"
 msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10260,34 +10369,34 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Opozorilo!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Datoteka obstaja, prepiši?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10296,7 +10405,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10305,7 +10414,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10314,7 +10423,7 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %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?"
@@ -10322,28 +10431,39 @@ msgstr ""
 "Evolucija je zaznala neshranjene datoteke iz prejšnjih sej.\n"
 "Jih želite poskusiti obnoviti?"
 
-#: 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 ""
+"To sporočilo ni bilo poslano.\n"
+"\n"
+"Želite shraniti spremembe?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Podpisi"
 
-#: 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 "Sestavi novo sporočilo"
 
-#: 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."
@@ -10351,7 +10471,18 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Nisem mogel aktivirati gradnika za izbiro naslova."
 
-#: 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 ""
+"Nisem mogel ustvariti okna skladatelja:\n"
+"Ne morem aktivirati komponente urejevalnika HTML."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10359,13 +10490,13 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Ne morem aktivirati komponente urejevalnika 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."
@@ -10373,8 +10504,9 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
 "identitet v komponenti pošte."
 
-#: 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 morem inicializirati Evolucijinega sestavljalca."
 
 #: data/evolution.desktop.in.h:1
@@ -10425,8 +10557,8 @@ msgstr "Zadeva vsebuje"
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#: 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?"
@@ -10574,7 +10706,8 @@ msgid "years"
 msgstr "let"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Pozabili ste izbrati datum."
 
 #: filter/filter-datespec.c:269
@@ -10630,15 +10763,12 @@ msgid "Add action"
 msgstr "Dodaj dejanje"
 
 #: 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 ""
-"Pozabili ste izbrati mapo.\n"
-"Pojdite nazaj in navedite veljavno mapo v katero naj se dostavlja pošta."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Navedite ime datoteke:"
 
-#: 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 "Izberi mapo"
 
@@ -10651,7 +10781,7 @@ msgstr ""
 "Napaka v regularnem izrazu '%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 "Pomembno"
@@ -10838,222 +10968,226 @@ msgid "Beep"
 msgstr "Pisk"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "vsebuje"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Zbrisano"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ne vsebuje"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "se ne konča z"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ne obstaja"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "ne obstaja"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ne zveni kot"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "se ne začne z"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Osnutek"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "se konča z"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "obstaja"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr "Navezava"
 
-#: 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 pred"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "je označeno"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "je večje"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "je manjše"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ni"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "ni označeno"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 #, fuzzy
 msgid "Label"
 msgstr "oznaka9"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Glava sporočila"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Izvedi ukaz lupine"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 msgid "Play Sound"
 msgstr "Predvajaj zvok"
 
-#: 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 "Beri"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:46
-msgid "returns"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "je večje"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "je manjše"
-
-#: filter/libfilter-i18n.h:49 filter/score-rule.c: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 "Točke"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Izvedi ukaz lupine"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "zveni kot"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Izvorni račun"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "se začne z"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: 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 "Zadeva"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Nastavi stanje"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "vsebuje"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "ne vsebuje"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "se ne konča z"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "ne obstaja"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "ne obstaja"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "ne zveni kot"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "se ne začne z"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "se konča z"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "obstaja"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "je označeno"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "je po"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "je pred"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "je večje"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "je manjše"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "ni označeno"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "ni"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "je"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "je večje"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "je manjše"
+
+#: filter/libfilter-i18n.h:60
+msgid "returns"
+msgstr ""
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "zveni kot"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "se začne z"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Pravila"
@@ -11087,31 +11221,31 @@ msgstr "Kot vir morate navesti vsaj eno mapo."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolucija uvaža vašo staro pošto Elm."
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Uvažam..."
 
-#: 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 "Prosim pokačajte"
 
-#: 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 "Uvažam %s kot %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 "Pregledujem %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 "Pošta"
 
@@ -11172,39 +11306,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 "Evolucija uvaža vaše podatke iz Netscapea"
 
 #. 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 "Smeti"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Krajevna datoteka s pošto %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 "Pregledujem mapo"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Pričenjam uvoz"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Uredi 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?"
@@ -11324,26 +11458,36 @@ msgid "Folder containing mail"
 msgstr "Mapa, ki vsebuje pošto"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "javno"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Mapa, ki vsebuje pošto"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Navidezne smeti"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Mapa navideznih smeti"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Ta mapa ne more vsebovati sporočil."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Spremeni lastnosti te mape"
 
-#: 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."
@@ -11351,78 +11495,79 @@ msgstr ""
 "Nekatere vaše nastavitve pošte se zdijo neveljavne. Prosim, preverite, če je "
 "vse v redu."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Niste nastavili postopka prenašanja pošte"
 
-#: 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 "Opozorilo: Spremenjeno sporočilo"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Sestavi novo sporočilo"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Novo sporočilo"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Na_tisni sporočilo"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Novo poštno sporočilo"
 
-#: 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 morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Ne morem inicializirati Evolucijine komponente za nastavitev pošte."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Ne morem inicializirati Evolucijine komponente za podatke o mapah"
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: 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 "Nisem mogel ustvariti začasnega imenika: %s"
@@ -11467,129 +11612,129 @@ msgstr "%d poslanih"
 msgid "%d total"
 msgstr "skupaj %d"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 msgid "Create _Virtual Folder From Search..."
 msgstr "Iz iskanja ustvari na_videzno mapo..."
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: 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 glede na p_oštni seznam"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: 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 "_Odgovori pošiljatelju"
 
-#: 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 "Odgovori na _seznam"
 
-#: 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 "Odgovori _vsem"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr "Nave_zuj se..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico končano"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 msgid "Cl_ear Flag"
 msgstr "Zb_riši zastavico"
 
 #. 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 "Označi kot _prebrano"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 msgid "_Mark as Unimportant"
 msgstr "Označi kot _nepomembno"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 msgid "U_ndelete"
 msgstr "O_dbriši"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 msgid "Mo_ve to Folder..."
 msgstr "Presta_vi v mapo..."
 
-#: 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 "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 msgid "Appl_y Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 msgid "VFolder on M_ailing List"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vMapa glede na dopisni seznam (%s)"
@@ -11662,20 +11807,20 @@ msgstr "Niste vpisali vseh potrebnih podatkov."
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: 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 "_Gostitelj:"
 
-#: 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 "_Uporabniško ime:"
 
-#: 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 "_Pot:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Ne morete ustvariti dveh računov z enakim imenom."
 
@@ -11692,14 +11837,14 @@ msgid "Really delete account?"
 msgstr "Resnično zbriši račun?"
 
 #: 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 "Izključi"
 
 #: 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 "Vključi"
 
@@ -11788,9 +11933,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 ""
 "Pošiljate pošto v obliki HTML, a naslednji prejemniki ne želijo prejemati "
 "takšne pošte:\n"
@@ -11833,7 +11979,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: 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?"
@@ -11841,28 +11987,28 @@ msgstr ""
 "Ni mogoče odpreti mape osnutkov za ta račun.\n"
 "Želite uporabiti privzeto mapo osnutkov?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Na %s, %Y-%m-%d ob %H:%M, je %%s napisal(a):"
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: 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 "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ste prepričani, da želite urediti vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11870,7 +12016,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11878,32 +12024,32 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Prepiši datoteko?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 msgid "Go to next folder with unread messages?"
 msgstr "Pojdi v naslednjo mapo z neprebranimi sporočili?"
 
-#: 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?"
@@ -11911,7 +12057,7 @@ msgstr ""
 "V tej mapi ni več novih sporočil.\n"
 "Želite iti v naslednjo mapo?"
 
-#: 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"
@@ -11923,7 +12069,7 @@ msgstr ""
 " \n"
 "Resnično zbriši ta sporočila? "
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11932,33 +12078,33 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "ZDA-pismo"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: 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 "Ste prepričani, želite odpreti vseh %d sporočil v ločenih oknih?"
 
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
@@ -11966,31 +12112,31 @@ msgstr ""
 "Prosim navedite datoteko s podpisom\n"
 "v naprednem odseku nastavitev podpisa."
 
-#: 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 "_Skripta"
 
-#: 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 "Neimenovan"
 
-#: 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 "Dodaj nov podpis"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Dodaj nov podpis"
@@ -12051,16 +12197,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za račune"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr "Račun %d"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: 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 "Vzpostavljam povezavo s strežnikom..."
 
@@ -12774,78 +12920,74 @@ msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nisem mogel ustvariti začasne datoteke '%s': %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "zunanjem pregledovalniku"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Naloži _slike"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Naloge s prekoračenim rokom:"
 
-#: 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 "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Shrani sliko kot..."
 
@@ -12854,108 +12996,109 @@ msgstr "Shrani sliko kot..."
 msgid "Pinging %s"
 msgstr "Pregledujem %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/mail-format.c:776 mail/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 "Slab naslov"
 
-#: 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 "Od"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: 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 "Za"
 
-#: 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 "Pošta"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "To sporočilo ima elektronski podpis. Za več podatkov kliknite na ikono "
 "ključavnice."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nisem mogel ustvariti konteksta preverjanja 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 "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
 
-#: 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 ""
 "To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: 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 "Krajevne mape"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Prenastavljam mapo"
 
-#: 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"
@@ -12964,27 +13107,22 @@ msgstr ""
 "Ne morem shraniti meta podatkov mape; verjetno te mape ne boste mogli več "
 "odpreti: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ne morem shraniti meta podatkov mape v %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ne morem zbrisati meta podatkov mape %s: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s se ne da nasatviti, saj ni krajevna mapa"
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12992,15 +13130,15 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Ne morete spremeniti oblike zapisa map, ki niso krajevne."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znova nastavi /%s"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "Ne morete spremeniti oblike zapisa map, ki niso krajevne."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13241,21 +13379,21 @@ msgstr "Čakam..."
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Zapomni si to geslo"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Pomni geslo do konca seje"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Vpišite geslo"
 
@@ -13264,12 +13402,12 @@ msgstr "Vpišite geslo"
 msgid "Could not save signature file: %s"
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 #, fuzzy
 msgid "Save signature"
 msgstr "Podpisi"
 
-#: 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"
@@ -13279,14 +13417,12 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: mail/mail-signature-editor.c:371
+#: mail/mail-signature-editor.c:372
 #, fuzzy
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
-"Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" ali "
-"\"domači\"."
+msgid "Enter a name for this signature."
+msgstr "za ta podpis uporabi _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 "Ime:"
 
@@ -13326,7 +13462,7 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: 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 "vMape"
 
@@ -13356,67 +13492,67 @@ msgstr "(brez zadeve)"
 msgid "%s - Message"
 msgstr "%s - sporočilo"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "najvišja"
 
-#: 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 "Danes %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %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 "Ustvarjam seznam sporočil"
 
@@ -13490,46 +13626,72 @@ msgstr "Odgovori vsem"
 msgid "Review"
 msgstr "Predogled"
 
-#: 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: _Zastavica za nadaljevanje..."
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "končano"
+
+#: mail/message-tags.glade.h:5
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Clear Flag"
+msgstr "Zb_riši zastavico"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Rok do"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Označeno"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Pregledujem mape pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Pregledujem korenske mape na \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Naročam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Preklicujem naročnino na mapo \"%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 "Mapa"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Shrani v mapo..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Strežnik ni bil izbran"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Prosimo izberite strežnik."
 
@@ -23430,12 +23592,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Brez opisa"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Povzetek poš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 "Krajevne mape"
 
@@ -23445,23 +23607,23 @@ msgstr "Krajevne mape"
 #. (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 "LJLJ:LJMB:LJPZ"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com beseda dneva"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Citati dneva"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Dodaj vir novic"
 
-#: 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 "Vpišite vir novic, ki ga želite dodati"
 
@@ -23499,11 +23661,11 @@ msgstr "(ni opisa)"
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr "Napaka ob prenašanju podatkov za"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Vreme"
 
@@ -24832,6 +24994,11 @@ msgstr ""
 "Nisem mogel prenesti mape:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Odpri v %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25072,12 +25239,25 @@ msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
 #: 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 "Izbrano ime mape ni veljavno: %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 ""
+"Nisem mogel preimenovati mape:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25086,12 +25266,12 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Ustvari _novo mapo..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nova..."
 
@@ -25121,20 +25301,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Prosim, izberite podatke, ki jih želite uvoziti:"
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:243
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Uvažam %s\n"
-"Uvoznik ni pripravljen.\n"
-"Čakam 5 sekund na nov poskus."
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25143,22 +25310,22 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Mapa %s ne obstaja"
 
-#: 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 "Napaka Evolucije"
 
-#: 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"
@@ -25167,11 +25334,11 @@ msgstr ""
 "Ni uvoznika, ki bi lahko obravnaval\n"
 " %s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Uvažam"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25180,17 +25347,17 @@ msgstr ""
 "Uvažam %s.\n"
 "Pričenjam %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Napaka ob zagonu %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Napaka ob nalaganju %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25199,31 +25366,31 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Ime datoteke:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Uvozi podatke in nastavitve iz starejših programov"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Uvozi eno samo datoteko"
 
-#: 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"
@@ -25231,24 +25398,24 @@ msgstr ""
 "Prosim počakajte...\n"
 "Iščem že obstoječe namestitve"
 
-#: 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 "Poganjam pametne uvoznike"
 
-#: 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 "Od: %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: 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 "Uvozi"
 
@@ -25274,32 +25441,32 @@ msgstr "Uskljajujem mapo"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Uskladi \"%s\""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolucija "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Odpiram mapo %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 "Odpiram mapo %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 "Odpri v %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 "Nisem mogel preimenovati mape: %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 ""
@@ -25341,44 +25508,44 @@ msgstr "Ime mape ne more vsebovati poševnic"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' in '..' sta rezervirana za imena map."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Program 'Bug buddy' ni bil najden v vaši poti ($PATH)."
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "_O Ximianovi Evoluciji..."
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo želite odpreti"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Ustvari novo bližnjico"
 
-#: 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 "Izberite mapo na katero naj kaže bližnjica:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: 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 "Delaj _brez mreže"
 
-#: 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 "Delaj brez mreže"
 
@@ -25386,27 +25553,27 @@ msgstr "Delaj brez mreže"
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: 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 "(brez)"
 
-#: 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 Evolucija je trenutno na mreži.  Kliknite na ta gumb za delo brez "
 "mreže."
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolucija je v procesu odklapljanja od mreže."
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25424,12 +25591,12 @@ msgstr ""
 "Napaka iz aktivacijskega sistema je:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25440,19 +25607,19 @@ msgstr ""
 "je nepričakovano zaključila. Morali boste zapreti in znova\n"
 "pognati Evolucijo, če želite dostopati do teh podatkov."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Generična napaka"
 
@@ -25591,58 +25758,62 @@ msgstr "Bližnjice"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom že obstaja"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Izbrana vrsta mape ni veljavna"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Mapa ni prazna"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Izbrana vrsta ni podprta v tem hranilniku"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Izbrane mape ni možno spremeniti ali odstraniti"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Mapa ne more postati otrok svojih potomcev"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Ne morem ustvariti mape s takšnim imenom"
 
+#: 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 (...)"
@@ -25857,9 +26028,10 @@ msgstr ""
 "Prosim, za nadaljevanje kliknite gumb \"Naprej\". "
 
 #: 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 ""
@@ -25876,26 +26048,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolucijin uvozni druid"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolucijin uvozni druid"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Uvozi datoteko (korak 3 od 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Vrsta uvoznika (korak 1 od 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Izberite uvoznike (korak 2 od 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Izberi datoteko (korak 2 od 3)"
 
-#: shell/importer/import.glade.h:8
+#: shell/importer/import.glade.h:7
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -26121,10 +26289,10 @@ msgstr "Poglej trenutni stik"
 #: 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 "_Dejanja"
 
@@ -26242,7 +26410,7 @@ msgid "Print this item"
 msgstr "Natisni ta predmet"
 
 #: 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 "Shrani"
 
@@ -26269,7 +26437,7 @@ msgstr "Shrani ta predmet 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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -26351,7 +26519,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Načrtuj sestanek za ta predmet"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Prikroji Mojo Evolucijo"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26401,29 +26570,30 @@ msgid "Post a message to a Public folder"
 msgstr "Prestavi sporočilo v novo mapo"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Naroči se na mape..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Kaži okno predogleda sporočila"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Naroči se ali prekliči naročnino na mape z oddaljenih strežnikov"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "Pano _predogleda"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_Naroči se na mape..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Spremeni lastnosti te mape"
@@ -26517,7 +26687,7 @@ msgstr "Niten seznam sporočil"
 msgid "_Expunge"
 msgstr "_Uniči"
 
-#: 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 "_Mapa"
 
@@ -26816,7 +26986,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26924,7 +27095,7 @@ msgstr "_Citirano"
 msgid "_Resend..."
 msgstr "_Preimenuj..."
 
-#: 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 "_Orodja"
 
@@ -26939,12 +27110,12 @@ msgstr "Zapri to 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:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_Zapri"
 
 #: 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 "Po_gled"
 
@@ -27118,7 +27289,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Shrani predmet in zapri dialog"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Pomoč"
 
@@ -27283,7 +27454,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Ustvari _novo mapo..."
 
 #: 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
@@ -27300,114 +27471,134 @@ msgid "Pi_lot Settings..."
 msgstr "_Nastavitve pilota..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "_Nastavitve pilota..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Ustvari _novo mapo..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Oddaja / sprejem"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Nastavitev pošte"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Nastavitev pošte"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Kaži podatke o Ximian Evoluciji"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mrežo"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "_Pogosto zastavljena vprašanja"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "_O Ximian Evoluciji..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Mapa"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Uvozi..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Nastavitve poslov..."
+msgid "_Remove Other User's Folder"
+msgstr "Ustvari _novo mapo..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Nastavitve pošte..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bližnjicami"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Bližnjica"
@@ -27647,11 +27838,11 @@ msgstr "Nabor znakov"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Urejevalnik iskanja"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
@@ -27728,6 +27919,59 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr " _Odstrani"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "Dodaj >>"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Pregledujem za novimi sporočili"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Mapa ni prazna"
+
+#~ msgid "1 byte"
+#~ msgstr "1 bajt"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u bajtov"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Pozabili ste izbrati mapo.\n"
+#~ "Pojdite nazaj in navedite veljavno mapo v katero naj se dostavlja pošta."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s se ne da nasatviti, saj ni krajevna mapa"
+
+#, fuzzy
+#~ msgid "Type the name by which you would like to refer to this signature."
+#~ msgstr ""
+#~ "Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" "
+#~ "ali \"domači\"."
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Uvažam %s\n"
+#~ "Uvoznik ni pripravljen.\n"
+#~ "Čakam 5 sekund na nov poskus."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolucijin uvozni druid"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Nastavitve poslov..."
+
 #~ msgid "Error in search expression."
 #~ msgstr "Napaka v iskalnem izrazu."
 
@@ -27770,15 +28014,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Non-Participants"
 #~ msgstr "Ne-udeleženci"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "To sporočilo ni bilo poslano.\n"
-#~ "\n"
-#~ "Želite shraniti spremembe?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (privzeto)"
@@ -28451,9 +28686,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "seconds."
 #~ msgstr "sekund."
 
-#~ msgid "use _HTML for this signature"
-#~ msgstr "za ta podpis uporabi _HTML"
-
 #~ msgid "Could not create a PGP encryption context."
 #~ msgstr "Nisem mogel ustvariti konteksta šifiranja PGP."
 
@@ -28523,9 +28755,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Task..."
 #~ msgstr "_Naloga..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Nastavitve pošte..."
-
 #~ msgid "Create a virtual folder based on this search"
 #~ msgstr "Ustvari navidezno mapo za to iskanje"
 
@@ -28589,12 +28818,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Email contains"
 #~ msgstr "E-naslov vsebuje"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Podatki o zasedenosti (%s do %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "Podatki o iKodledarju"
-
 #~ msgid "Mark as Unim_portant"
 #~ msgstr "Označi kot ne_pomembno"
 
@@ -31369,9 +31592,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "label2"
 #~ msgstr "label2"
 
-#~ msgid "<< Remove"
-#~ msgstr "<< odstrani"
-
 #~ msgid "Discard this message?"
 #~ msgstr "Zavrzi to sporočilo"
 
diff --git a/po/sv.po b/po/sv.po
index c10525fc55..623572f6d5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,12 +6,12 @@
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
 # Johan Dahlin <zilch.am@home.se>, 2001.
 #
-# $Id: sv.po,v 1.154 2002/09/09 20:06:36 ettore Exp $
+# $Id: sv.po,v 1.155 2002/10/07 22:46:24 ettore Exp $
 #
 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: 2002-04-01 01:16+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -324,11 +324,17 @@ msgstr "Efternamn"
 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 "Namnlös kontaktlista"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: 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 "Kunde inte initiera 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öker..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Ansluter till LDAP-servern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Lägger till kort till 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 "Tar bort kort från 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 "Modifierar kort från LDAP-servern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Mottar LDAP-sökresultat..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr "Fel vid sökning"
 
@@ -396,13 +402,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook inte inlä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 "Kunde inte starta 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 "Kunde inte starta wombat"
@@ -474,10 +480,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik för adressbokstestkontrollen"
 
 #: 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"
@@ -494,28 +500,38 @@ msgstr "LDAP-server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som innehåller 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 "Mapp som innehåller 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 "Skapa ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "Kontakt_lista"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Skapa ny kontaktlista"
@@ -565,7 +581,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL stöds inte i detta bygge av 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 "Kunde inte initiera gnome-vfs"
 
@@ -573,11 +589,11 @@ msgstr "Kunde inte initiera gnome-vfs"
 msgid "Other Contacts"
 msgstr "Andra kontakter"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: 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."
@@ -585,7 +601,7 @@ msgstr ""
 "Vi kunde inte öppna denna adressbok. Kontrollera att sökvägen\n"
 "existerar och att du har rätt att komma åt 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"
@@ -596,7 +612,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar"
 
-#: 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"
@@ -608,7 +624,7 @@ msgstr ""
 "programmet från CVS-källkod efter det att du har hämtat\n"
 "OpenLDAP från länken nedan.\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"
@@ -619,37 +635,50 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar"
 
-#: 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 ""
+"Kunde inte autentisera till IMAP-servern.\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 "Ange lösenord för %s (användare %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr "Namn börjar med"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "Namn börjar med"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori är"
 
 #. 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ågot fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: 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"
@@ -657,7 +686,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"
@@ -665,25 +694,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 "Alla kategorier"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappbläddraren kommer att visa"
 
@@ -751,53 +780,53 @@ msgstr " _Kontrollera vilka typer som stöds "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Alternativ"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "Ta bort"
-
-#: 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
 #, 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 "Ta bort"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Alternativ"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -940,50 +969,56 @@ msgstr "En"
 
 #: 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 " (standard)"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr " (standard)"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Sök_omfattning: "
 
 #. 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öker"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Markera allt"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Borttagen"
 
-#: 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"
@@ -994,7 +1029,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"
@@ -1003,48 +1038,48 @@ 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 "Källinformation"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Ansluter till 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
 #, fuzzy
 msgid "Step 4: Display Name"
 msgstr "Pip vid alarmvisning"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Pren"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Lagra sökning som vMapp"
 
-#: 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 @@ 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"
@@ -1061,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"
@@ -1069,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"
@@ -1079,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"
@@ -1089,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 "
@@ -1105,7 +1140,7 @@ msgstr ""
 "Detta är det största antalet kort att hämta. Att ställa in detta tal för "
 "högt kommer att slöa ned adressboken."
 
-#: 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 "
@@ -1115,7 +1150,7 @@ msgstr ""
 "Observera att ställa in detta till \"E-postadress\" kräver anonym åtkomst "
 "till din ldap-server."
 
-#: 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 "
@@ -1125,7 +1160,7 @@ msgstr ""
 "Detta namn kommer att användas för att identifiera ditt konto. Det används "
 "endast för visning."
 
-#: 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"
@@ -1133,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"
@@ -1146,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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "E-postadress"
 
-#: 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
@@ -1173,51 +1208,51 @@ msgstr ""
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "Lägg till ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Lägg till åtgärd"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Lägg till åtgärd"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Albany"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Ta bort alla"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Visning"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Distinguished 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Hämtningsgräns"
 
-#: 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
@@ -1227,103 +1262,103 @@ msgstr "_Hämtningsgräns"
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Redigera möte"
 
-#: 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 "_Alternativ"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr " (standard)"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Utgångspunkt för sökning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Servernamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Slumringstid (minuter)"
 
-#: 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 "kontaktlisteredigerare"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Inga kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Ansluter igen till %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 "Allmänt"
 
-#: 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öker"
@@ -1338,8 +1373,8 @@ msgstr "Fabrik för adressbokens namnvalsgränssnitt"
 
 #. 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"
@@ -1370,11 +1405,11 @@ msgstr "(%d visas inte)"
 msgid "Unnamed Contact"
 msgstr "Namnlös 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 "Välj kontakter från adressboken"
 
-#: 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 "Sök efter en kontakt"
@@ -1448,7 +1483,7 @@ msgid "D_epartment:"
 msgstr "A_vdelning:"
 
 #: 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"
 
@@ -1508,13 +1543,13 @@ msgstr "Vill ha _HTML-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c: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 "_Ta bort"
 
@@ -1542,1024 +1577,1024 @@ msgstr "URL till _publik kalender:"
 msgid "_Web page address:"
 msgstr "_Webbsideadress:"
 
-#: 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 "USA"
 
-#: 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 "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 och Barbados"
 
-#: 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 "Österrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbajdzjan"
 
-#: 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 "Vitryssland"
 
-#: 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 och Hercegovina"
 
-#: 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ön"
 
-#: 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 "Brittiskt territorium i Indiska Oceanen"
 
-#: 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 "Kambodja"
 
-#: 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öarna"
 
-#: 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 "Centralafrikanska republiken"
 
-#: 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 "Julön"
 
-#: 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öarna"
 
-#: 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 "Komorerna"
 
-#: 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öarna"
 
-#: 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 "Elfenbenskusten"
 
-#: 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 "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 "Tjeckien"
 
-#: 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 "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 "Dominikanska republiken"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Östtimor"
 
-#: 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 "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 "Ekvatorialguinea"
 
-#: 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öarna"
 
-#: 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öarna"
 
-#: 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 "Frankrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Franska 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 "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 "Franska sydterritorierna"
 
-#: 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 "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 "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 "Grekland"
 
-#: 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 och McDonald-öarna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "Vatikanstaten"
 
-#: 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 "Ungern"
 
-#: 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 "Jordanien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazakstan"
 
-#: 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 "Korea, republiken"
 
-#: 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 "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 "Macao"
 
-#: 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 "Maldiverna"
 
-#: 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öarna"
 
-#: 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 "Moldavien, republiken"
 
-#: 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 "Marocko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Moçambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Myanmar (Burma)"
 
-#: 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 "Nederländerna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Nederländska Antillerna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Nya Kaledonien"
 
-#: 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 "Nya Zeeland"
 
-#: 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 "Nigeria"
 
-#: 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öarna"
 
-#: 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 "Norra Marianeröarna"
 
-#: 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 "Palestina"
 
-#: 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 Nya 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 "Filippinerna"
 
-#: 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 "Ryssland"
 
-#: 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 och 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 och Grenadinerna"
 
-#: 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é och 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 "Saudiarabien"
 
-#: 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 "Seychellerna"
 
-#: 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 "Slovakien"
 
-#: 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öarna"
 
-#: 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 "Sydgeorgien och södra Sandwichöarna"
 
-#: 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 och 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 och 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 "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 "Tadzjikistan"
 
-#: 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, förenade republiken"
 
-#: 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 och Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunisien"
 
-#: 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 "Turkiet"
 
-#: 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 och Caicosöarna"
 
-#: 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 "Förenade Arabemiraten"
 
-#: 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:s mindre avlägsna öar"
 
-#: 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 "Brittiska Jungfruöarna"
 
-#: 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 "Amerikanska Jungfruöarna"
 
-#: 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 och Futunaöarna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Västsahara"
 
-#: 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 "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"
 
@@ -2596,20 +2631,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunde inte hitta widget för fältet: \"%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 "Snabbinläggning av kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Redigera fullständigt namn"
 
-#: 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 "Fullständigt namn"
 
-#: 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"
 
@@ -2631,6 +2666,19 @@ msgstr ""
 "%s finns redan\n"
 "Vill du skriva över 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 "Skriv över fil?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adress _2:"
@@ -2761,7 +2809,7 @@ msgstr "kontaktlisteredigerare"
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigerare"
 
-#: 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 "Spara lista som VCard"
 
@@ -2811,7 +2859,7 @@ msgstr ""
 "redan i den här mappen. Vill du lägga till den ändå?"
 
 #: 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 "Avancerad sökning"
 
@@ -2820,24 +2868,24 @@ msgstr "Avancerad sökning"
 msgid "Search"
 msgstr "Sök"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Inga 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
 msgid "Error getting book view"
 msgstr "Fel vid hämtande av bokvy"
 
-#: 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"
@@ -2849,10 +2897,10 @@ msgid "Success"
 msgstr "Lyckades"
 
 #: 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 "Okänt fel"
 
@@ -2860,7 +2908,7 @@ msgstr "Okänt fel"
 msgid "Repository offline"
 msgstr "Lagret frånkopplat"
 
-#: 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 "Åtkomst nekas"
@@ -2881,8 +2929,8 @@ msgstr "Protokollet stöds inte"
 #: 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 "Avbruten"
 
@@ -2933,7 +2981,7 @@ msgstr "Fel vid borttagning av 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 "Fel vid borttagning av kort"
 
@@ -2946,11 +2994,10 @@ msgid "Display Cards"
 msgstr "Visa kort"
 
 #: 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 ""
 "Du har begärt att %d kort ska vara kort. Detta kommer att orsaka att %d nya "
 "fönster visas på din skärm. Vill du verkligen visa alla dessa kort?"
@@ -3038,7 +3085,7 @@ msgstr "Adressbok"
 
 #: 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 "Spara som VCard"
@@ -3122,7 +3169,7 @@ msgstr "Kopiera"
 msgid "Paste"
 msgstr "Klistra in"
 
-#: 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
@@ -3130,8 +3177,8 @@ msgstr "Klistra in"
 msgid "Delete"
 msgstr "Ta bort"
 
-#: 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 "_Aktuell vy"
@@ -3140,7 +3187,7 @@ msgstr "_Aktuell vy"
 #. 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,x,y,z,å,ä,ö"
 
@@ -3148,11 +3195,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,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,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"
@@ -3284,7 +3331,7 @@ msgid "Include:"
 msgstr "Inkludera:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Liggande"
 
@@ -3309,7 +3356,7 @@ msgid "Options"
 msgstr "Alternativ"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientering"
 
@@ -3332,7 +3379,7 @@ msgstr "Papperskälla:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Stående"
 
@@ -3394,20 +3441,20 @@ msgstr "Namnlöst möte"
 
 #: 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ög"
 
 #: 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 "Låg"
 
@@ -3418,13 +3465,17 @@ msgstr "Låg"
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: 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 "Fel vid kommunikation med kalenderserver"
 
-#: 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 "Kunde inte läsa pilotens kalenderprogramblock"
 
@@ -3532,11 +3583,11 @@ msgstr "Slumringstid (minuter)"
 msgid "_Edit appointment"
 msgstr "_Redigera möte"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Ingen beskrivning finns tillgänglig."
 
-#: 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 ""
 "konfigurerad att skicka e-post. Evolution kommer att\n"
 "visa en normal dialogruta istället."
 
-#: 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 "Varning"
 
-#: 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 "
@@ -3571,15 +3622,15 @@ msgstr ""
 "\n"
 "Är du säker på att du vill köra detta 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 "Fråga mig inte om detta program 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 "Kunde inte initiera 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 "Kunde inte skapa fabriken för alarmaviseringstjänsten"
 
@@ -3628,7 +3679,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 ""
@@ -3706,9 +3757,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
@@ -3725,13 +3776,13 @@ msgid "Assigned"
 msgstr "Tilldelad"
 
 #: 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"
 
@@ -3751,75 +3802,95 @@ msgstr "Veckovy"
 msgid "Month View"
 msgstr "Månadsvy"
 
-#: 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 "Mapp som innehåller möten och evenemang"
 
-#: 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 till _publik kalender:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Mapp som innehåller möten och evenemang"
+
+#: 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 "Uppgifter"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Mapp som innehåller att-göra-objekt"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Skriv ut uppgifter"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Mapp som innehåller att-göra-objekt"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "_Möte"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Nytt möte"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "_Möte"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Skapa en ny anteckning"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "New All Day Appointment"
 msgstr "Nytt heldagsmöte"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmöte"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt möte"
@@ -3863,30 +3934,31 @@ msgid "Alarm Repeat"
 msgstr "Alarmupprepning"
 
 #: 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 ""
+"Detta är en e-postpåminnelse, men Evolution stöder inte denna typ av "
+"påminnelser än. Du kommer inte att kunna redigera alternativen för denna "
+"påminnelse."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Meddelande att visa"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Spela ljud:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Upprepa larmet"
 
-#: 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 ""
-"Detta är en e-postpåminnelse, men Evolution stöder inte denna typ av "
-"påminnelser än. Du kommer inte att kunna redigera alternativen för denna "
-"påminnelse."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Med dessa argument:"
@@ -3910,110 +3982,110 @@ msgstr "timme"
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
-#: 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 veckor"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 vecka"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 timme"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
-#: 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 "Spela ett ljud"
 
-#: 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 "Visa ett meddelande"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Skicka ett brev"
 
-#: 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 ett program"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Okänd åtgärd att utföra"
 
-#: 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 innan starten på mötet"
 
-#: 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 innan starten på mötet"
 
-#: 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 innan starten på mötet"
 
-#: 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 innan starten på mötet"
 
-#: 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 slut på möte"
 
-#: 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 efter slut på möte"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s vid %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 en okänd triggertyp"
@@ -4034,7 +4106,7 @@ msgstr "Påminnelser"
 
 #: 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 "Sammanfattning:"
 
@@ -4118,7 +4190,7 @@ msgid "Days"
 msgstr "dag"
 
 #: 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"
 
@@ -4131,7 +4203,7 @@ msgid "Minutes"
 msgstr "minut"
 
 #: 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 "måndag"
 
@@ -4141,7 +4213,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"
 
@@ -4154,7 +4226,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Visa v_eckonummer i datumbläddraren"
 
 #: 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"
 
@@ -4173,7 +4245,7 @@ msgid "Task List"
 msgstr "_Uppgiftslista"
 
 #: 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"
 
@@ -4190,7 +4262,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 "tisdag"
 
@@ -4199,7 +4271,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"
 
@@ -4425,8 +4497,8 @@ msgid "No summary"
 msgstr "Ingen sammanfattning"
 
 #: 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 "Spara som..."
 
@@ -4495,27 +4567,27 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: 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 "Möte"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: 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 "Schemaläggning"
 
-#: 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öte"
 
@@ -4584,19 +4656,19 @@ msgstr "Slutti_d:"
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en närvarande person."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Personen är redan närvarande på mötet!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Delegera till..."
 
@@ -4636,7 +4708,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 "OSA"
@@ -4648,7 +4720,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 "Status"
@@ -4724,47 +4796,47 @@ msgstr ":e"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Detta möte har upprepningsregler som inte kan redigeras med Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 msgid "first"
 msgstr "första"
 
-#: 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 "den"
 
-#: 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 "lista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Annan 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 "förekomster"
 
@@ -4856,7 +4928,7 @@ msgstr "Datum utfört:"
 
 #: 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 åtgärd"
 
@@ -4865,7 +4937,7 @@ msgid "Progress"
 msgstr "Förlopp"
 
 #: 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:"
 
@@ -4877,17 +4949,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äggande"
 
-#: 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 "Tilldelning"
 
-#: 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:"
@@ -4957,12 +5029,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 "Tar bort markerade objekt"
 
-#: 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 "_Öppna"
@@ -4971,30 +5043,30 @@ msgstr "_Öppna"
 msgid "_Save as..."
 msgstr "_Spara 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 "Skriv _ut..."
 
-#: 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 "Klipp _ut"
 
-#: 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 "_Kopiera"
 
-#: 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"
@@ -5020,12 +5092,12 @@ msgstr "_Markera markerade uppgifter som färdiga"
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: 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 "Uppdaterar objekt"
 
-#: 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 "Klicka för att lägga till en uppgift"
@@ -5034,8 +5106,8 @@ msgstr "Klicka för att lägga till en uppgift"
 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 "Färdigt"
 
@@ -5064,7 +5136,7 @@ msgid "Start Date"
 msgstr "Startdatum"
 
 #: 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 "Sammanfattning"
@@ -5131,446 +5203,452 @@ msgstr "fm"
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Nytt m_öte"
 
-#: 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 "Nytt _heldagsarrangemang"
 
-#: 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 "Nytt möte"
 
-#: 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 uppgift"
 
-#: 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 "Skriv ut..."
 
-#: 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å till _idag"
 
-#: 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å till 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 "_Publicera ledig-/upptageninformation"
 
-#: 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 "_Konfigurera..."
 
-#: 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 "_Konfigurera..."
 
-#: 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 "_Spara 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
 msgid "_Schedule Meeting..."
 msgstr "_Boka möte..."
 
-#: 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 "_Vidarebefordra som 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 "Gör denna förekomst _flyttbar"
 
-#: 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 "Ta bort denna f_örekomst"
 
-#: 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 "Ta bort _alla förekomster"
 
-#: 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-verktygen verkar inte vara installerade på detta 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 "Fel vid körning av %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 "Slutar: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Färdigt "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Beskrivning:</b> %s"
 
-#: 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-fel"
 
-#: 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 okänd 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."
 msgstr ""
 "<br> Granska följande information, och välj sedan en åtgärd från menyn nedan."
 
-#: 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 "_Plats:"
 
-#: 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 "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
 msgid "Tentatively Accepted"
 msgstr "Preliminärt godtaget"
 
-#: 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 "Avböjt"
 
-#: 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 "Okänd"
 
-#: 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älj en åtgärd:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Uppdatera"
 
-#: 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 "Acceptera"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Acceptera preliminärt"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Neka"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Skicka ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Uppdatera svarandestatus"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
-#: 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 "Avbryt"
 
-#: 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 publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Mötesinformation"
 
-#: 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> begär din närvaro vid ett möte."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Mötesförslag"
 
-#: 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> vill lägga till i ett befintligt möte."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Mötesuppdatering"
 
-#: 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> vill få den senaste mötesinformationen."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Begäran av mötesuppdatering"
 
-#: 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 svarat på en mötesbegäran."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Mötessvar"
 
-#: 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 avbokat ett möte."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Mötesavbokning"
 
-#: 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 skickat ett obegripligt meddelande."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Felaktigt mötesmeddelande"
 
-#: 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 publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: 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> begär att du utför en uppgift."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
-#: 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> vill lägga till i en befintlig uppgift."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: 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> vill få den senaste uppgiftsinformationen."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Begäran om uppgiftsuppdatering"
 
-#: 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 svarat på en uppgiftstilldelning."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: 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 avbokat en uppgift."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Uppgiftsavbokning"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: 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 publicerat ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: 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> begär din ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Ledig-/Upptagenbegäran"
 
-#: 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 svarat på en ledig-/upptagenbegäran."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: 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 "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Meddelandet innehåller typer av begäran som inte stöds."
 
-#: calendar/gui/e-itip-control.c: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 "Bilagan innehåller inte ett giltigt kalendermeddelande"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: 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 ""
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: 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 "Ett fel uppstod när nyhetskällan hämtades"
 
-#: 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 "Objektet kunde inte skickas!\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 "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\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 kunde inte uppdateras!\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 ""
 "Närvarandestatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: 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ärvarandestatus kunde inte uppdateras på grund av ogiltig 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 "Kunde inte öppna mappen i \"%s\""
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Närvarandestatus är uppdaterad\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ärvarandestatus kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: 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 "Objektet skickat!\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 "Objektet kunde inte skickas!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Välj mapp"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Välj mapp"
@@ -5616,7 +5694,7 @@ msgstr "startdatum"
 msgid "Chair Persons"
 msgstr "Ordförandepersoner"
 
-#: 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 "Nödvändiga deltagare"
 
@@ -5630,52 +5708,52 @@ msgid "Resources"
 msgstr "Resurs"
 
 #: 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 "Person"
 
 #: 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 "Resurs"
 
 #: 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 "Mötesordförande"
 
 #: 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ödvändig deltagare"
 
 #: 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 "Valfri deltagare"
 
 #: 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 "Icke-deltagare"
 
 #: 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 "Preliminärt"
 
 #: 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 "Delegerat"
 
@@ -5765,42 +5843,49 @@ msgstr "Mötets _starttid:"
 msgid "Meeting _end time:"
 msgstr "Mötets slu_ttid:"
 
-#: 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 "Öppnar uppgifter i %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 "Kunde inte läsa in uppgifterna 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 "Metoden som krävs för att läsa in \"%s\" stöds inte"
 
-#: 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 "Kunde inte öppna 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 "Fel vid start av %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Färdigdatum"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Utplånar"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
@@ -5814,7 +5899,13 @@ msgstr "Kunde inte öppna mappen i \"%s\""
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som krävs för att öppna \"%s\" stöds inte"
 
-#: 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 den %s"
+
+#: 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 "Öppnar kalender i %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Öppnar mappen %s"
@@ -5896,47 +5987,56 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Åtminstone en närvarande person krävs"
-
-#: 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 organisatör måste vara angiven."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Åtminstone en närvarande person krävs"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Evenemangsinformation"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Uppgiftsinformation"
 
-#: 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-/upptageninformation"
 
-#: 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
 msgid "Updated"
 msgstr "Uppdaterat"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr "Motförslag"
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Ledig-/upptageninformation (%s till %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åste vara närvarande på detta evenemang."
 
@@ -6172,7 +6272,7 @@ msgid "Print Calendar"
 msgstr "Skriv ut 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 "Förhandsgranska"
@@ -6195,7 +6295,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "URI:t som uppgiftsmappen ska visa"
 
-#: 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"
@@ -6208,12 +6308,12 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: 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 "Fråga mig inte igen."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 msgid "Print Tasks"
 msgstr "Skriv ut uppgifter"
 
@@ -6283,15 +6383,15 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Kunde inte ansluta till lager: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 msgid "Reminder!!"
 msgstr "Påminnelse!!"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 msgid "Calendar Events"
 msgstr "Kalenderhändelser"
 
-#: 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?"
@@ -6299,84 +6399,84 @@ msgstr ""
 "Evolution har hittat Gnome-kalenderfiler.\n"
 "Vill du importera dem till Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 msgid "Gnome Calendar"
 msgstr "Gnome-kalendern"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time förväntar sig 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 förväntar sig att argument 1 är en sträng"
 
-#: 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 till make-time måste vara en datum-/tidssträng enligt ISO 8601"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day förväntar sig 2 argument"
 
-#: 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 förväntar sig att argument 1 är 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 förväntar sig att argument 2 är ett heltal"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin förväntar sig 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 förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end förväntar sig 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 förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype förväntar sig 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? förväntar sig 2 argument"
 
-#: 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? förväntar sig att argument 1 är en 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? förväntar sig att argument 2 är en time_t"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? förväntar sig 2 argument"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? förväntar sig att argument 1 är en sträng"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? förväntar sig att argument 2 är en sträng"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6384,11 +6484,11 @@ msgstr ""
 "contains? förväntar sig att argument 1 är ett av \"any\", \"summary\", eller "
 "\"description\""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? förväntar sig minst 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)"
@@ -6396,22 +6496,27 @@ msgstr ""
 "has-categories? förväntar sig att alla argument är strängar eller att ett "
 "och endast ett argument är booleskt falsk (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? förväntar sig 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? förväntar sig att argument 1 är 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 av sökuttrycket gav inget booleskt värde"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Annat fel"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8005,81 +8110,81 @@ msgstr "Lagrar mappen \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr "Du måste vara ansluten för att kunna genomföra denna åtgärd"
 
-#: 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 "Synkroniserar mappar"
 
-#: 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 "Fel vid tolkning av 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 "Fel vid körning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Kan inte öppna spool-mappen"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Kan inte bearbeta spool-mappen"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hämtar meddelande %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Kan inte öppna meddelande"
 
-#: 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 "Misslyckades med meddelande %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 "Synkroniserar mapp"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Misslyckades med att hämta meddelande"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ogiltiga argument"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ogiltiga argument"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Kunde inte skapa rör till %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 "Misslyckades med att cacha meddelande %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 "Fel vid körning av filtersökning: %s: %s"
@@ -8126,11 +8231,11 @@ msgstr "Åtgärden stöds inte: sökning med uttryck: för %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Åtgärden stöds inte: sökning med uid: för %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Flyttar meddelanden"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Kopierar meddelanden till %s"
@@ -8454,7 +8559,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 "Felaktigt autentiseringssvar från servern."
 
@@ -8514,52 +8619,52 @@ msgstr "POP innan SMTP-auktorisering med en källa som inte är POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Misslyckades med kompilering av reguljärt uttryck: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL:en \"%s\" behöver ett användarnamn"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL:en \"%s\" behöver ett värdnamn"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL:en \"%s\" behöver en sökväg"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Slår upp: %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 "Namnuppslagning misslyckades: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Uppslagning av värdnamn misslyckades: %s: värden kunde inte hittas"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Slår upp: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Uppslagning av värdnamn misslyckades: %s: värden kunde inte hittas"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
@@ -8759,7 +8864,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"
@@ -8772,11 +8877,11 @@ msgstr ""
 "Fingeravtryck:     %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 "BRA"
 
-#: 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 "DÅLIG"
 
@@ -8798,7 +8903,7 @@ msgstr ""
 "Vill du acceptera ändå?"
 
 #. 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"
@@ -8853,68 +8958,76 @@ msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
 
-#: 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 "Åtgärden avbruten"
 
-#: 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 "Servern kopplade ifrån oväntat: %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 "Oväntat svar från IMAP-servern: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Oväntat svar från IMAP-servern: %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-kommandot misslyckades: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Serversvaret tog slut för tidigt."
 
-#: 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-serversvaret innehöll inte %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 "Oväntat OK-svar från IMAP-servern: %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 "Kunde inte skapa katalogen %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 "Kunde inte läsa in sammanfattning för %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 förstördes och återskapades på servern."
 
 #. 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 "Letar efter ändrade meddelanden"
 
-#: 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 "Misslyckades med att hämta meddelande"
 
-#: 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
@@ -8930,28 +9043,24 @@ msgstr ""
 "Kan inte hämta meddelande: %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 "Det finns inget sådant meddelande"
 
-#: 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 "Detta meddelande är inte tillgängligt för tillfället"
 
-#: 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 "Hämtar meddelandeinformation för nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Letar efter nya meddelanden"
-
-#: 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 "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -8968,6 +9077,11 @@ msgstr "Kunde inte öppna cachekatalogen: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Misslyckades med att cacha meddelande %s: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Misslyckades med att cacha meddelande %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Kontroll av ny e-post"
@@ -9015,75 +9129,70 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
 
-#: 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-tjänst för %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 "Anslutning avbruten"
 
-#: 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 "Kunde inte ansluta till %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 ""
 "Kunde inte ansluta till POP-servern,\n"
 "Fel vid skickande av filnamn: %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-tillägg stöds inte."
 
-#: 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-förhandlingar misslyckades"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Mappen är inte 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-servern %s stöder inte den begärda autentiseringstypen %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 "Inget stöd för autentiseringstypen %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 "%sAnge IMAP-lösenordet för %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 angav inte något lösenord."
 
-#: 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"
@@ -9094,24 +9203,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 "Det finns ingen mapp %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 "Mappnamnet kan inte innehålla returtecknet."
 
-#: 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 "Okänt fel: %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 "Föräldermappen får inte innehålla undermappar"
 
@@ -9187,8 +9296,8 @@ msgid ""
 msgstr "För läsande och lagrande av lokal e-post i mbox-standardspoolfiler."
 
 #: 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 "Lagringsroten %s är inte en absolut sökväg"
@@ -9200,7 +9309,7 @@ msgstr "Lagringsroten %s är ingen vanlig 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 "Kan inte få mapp: %s: %s"
@@ -9214,32 +9323,32 @@ msgstr "Lokala lager har ingen inkorg"
 msgid "Local mail file %s"
 msgstr "Lokal brevlådefil %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 "Kunde inte byta namn på mappen %s till %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 "Kunde inte byta namn på mappen \"%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 "Kunde inte ta bort mappsammanfattningsfilen \"%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 "Kunde inte ta bort mappindexfilen \"%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 "Kunde inte spara sammanfattningen: %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 "Kunde inte lägga till meddelandet i sammanfattningen: okänd orsak"
 
@@ -9259,6 +9368,7 @@ msgstr "Ogiltigt meddelandeinnehåll"
 
 #: 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"
@@ -9270,12 +9380,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\" finns inte."
 
 #: 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"
@@ -9301,7 +9413,8 @@ msgid "not a maildir directory"
 msgstr "är inte en brevlådekatalog"
 
 #: 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 "Kunde inte genomsöka mappen \"%s\": %s"
@@ -9329,7 +9442,7 @@ msgid "Storing folder"
 msgstr "Lagrar mapp"
 
 #: 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 inte skapa mapplås på %s: %s"
@@ -9498,40 +9611,45 @@ msgstr "\"%s\" är inte en katalog."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan inte öppna sökvägen till MH-katalogen: %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-mappar kan inte bytas namn på"
 
-#: 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 "Lagringsroten %s är ingen vanlig 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\" finns inte."
 
-#: 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\" är ingen vanlig fil."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr "Lagret stöder inte en INKORG"
 
-#: 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-brevlådefil %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-mappar kan inte bytas namn på"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mappar kan inte bytas namn på"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-mappar kan inte tas bort"
 
@@ -9626,47 +9744,47 @@ msgstr "Använd avbryt"
 msgid "Operation failed: %s"
 msgstr "Åtgärden misslyckades: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Hämtar POP-sammanfattning"
 
-#: 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 "Användaren avbröt"
 
-#: 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 "Kan inte hämta POP-sammanfattning: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Tömmer borttagna meddelanden"
 
-#: 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 "Inget meddelande 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 "Hämtar POP-meddelande %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 "Kan inte hämta meddelande %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
@@ -9937,45 +10055,45 @@ msgstr "Tillfälligt autentiseringsmisslyckande"
 msgid "Authentication required"
 msgstr "Autentisering krävs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Fel i 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 ""
 "Kunde inte ansluta till POP-servern,\n"
 "Fel vid skickande av filnamn: %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 "Meddelandet verkar inte vara korrekt utformat"
 
-#: 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 "RSET-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Fel i 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-servern %s stöder inte den begärda autentiseringstypen %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 "%sAnge SMTP-lösenordet för %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"
@@ -9986,89 +10104,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 "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-epostleverans 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 inte skicka meddelande: avsändaradressen är inte giltig."
 
-#: 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 "Skickar meddelande"
 
-#: 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 inte skicka meddelande: inga mottagare är angivna."
 
-#: 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 "Kan inte skicka meddelande: en eller flera ogiltiga mottagare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP-hälsning"
 
-#: 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-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 
-#: 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-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH-begäran misslyckades."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar från servern.\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-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
 
-#: 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-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: 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-begäran gjorde time-out: %s: brevet skickades inte"
@@ -10076,81 +10194,72 @@ msgstr "DATA-begäran gjorde time-out: %s: brevet skickades inte"
 #. 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 "Fel i 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 ""
 "DATA-skickande gjorde time-out: meddelandeslut: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Felaktigt autentiseringssvar från servern."
 
-#: 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-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "Fel i 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 "AUTH-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Fel i 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 "bilaga"
 
-#: 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 "Ta bort markerade objekt från bifogningslistan"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Lägg till bilaga..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
@@ -10182,7 +10291,7 @@ msgstr "MIME-typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Föreslå automatisk visning av bilaga"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
@@ -10193,45 +10302,45 @@ msgstr "Klicka här för att ta fram adressboken"
 #. * 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 "Svara till:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Från:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: 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 "Ange adresserna som ska få en kopia av meddelandet"
 
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: 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."
@@ -10242,12 +10351,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 "Ingen beskrivning"
@@ -10262,7 +10371,7 @@ msgstr "Bifoga en fil"
 msgid "Could not create a PGP signature context"
 msgstr "Kunde inte skapa ett PGP-signatursammanhang."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10271,34 +10380,34 @@ msgstr ""
 "Fel vid läsning av filen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Varning!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Filen finns, skriv över?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid åtkomst av filen: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10307,7 +10416,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10316,7 +10425,7 @@ msgstr ""
 "Kan inte trunkera filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10325,7 +10434,7 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %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?"
@@ -10333,28 +10442,39 @@ msgstr ""
 "Ximian Evolution har hittat osparade filer från en tidigare session.\n"
 "Vill du försöka återställa dem?"
 
-#: composer/e-msg-composer.c: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 ""
+"Meddelandet har inte skickats än.\n"
+"\n"
+"Vill du spara dina ändringar?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Varning: Ändrat meddelande"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Spara 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 ett meddelande"
 
-#: 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."
@@ -10362,7 +10482,18 @@ msgstr ""
 "Kan inte skapa redigerarfönstret:\n"
 "Kan inte aktivera adressväljarkontrollen."
 
-#: 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 ""
+"Kunde inte skapa redigerarfönstret:\n"
+"Kan inte aktivera HTML-redigerarkomponenten."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10370,13 +10501,13 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret:\n"
 "Kan inte aktivera HTML-redigerarkomponenten."
 
-#: 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."
@@ -10384,8 +10515,9 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret, eftersom du inte har\n"
 "konfigurerat några identiter i e-postkomponenten."
 
-#: 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 inte initiera Evolutions e-postredigerare."
 
 #: data/evolution.desktop.in.h:1
@@ -10436,8 +10568,8 @@ msgstr "Ämnet innehåller"
 msgid "Subject does not contain"
 msgstr "Ämnet innehåller inte"
 
-#: 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 "år"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Du har glömt att välja ett datum."
 
 #: filter/filter-datespec.c:269
@@ -10641,15 +10774,12 @@ msgid "Add action"
 msgstr "Lägg till åtgärd"
 
 #: 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 glömde välja en mapp.\n"
-"Gå tillbaka och ange en giltig mapp som e-post kan levereras till."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Ange filnamn:"
 
-#: 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älj mapp"
 
@@ -10662,7 +10792,7 @@ msgstr ""
 "Fel i reguljära uttrycket \"%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 "viktigt"
@@ -10851,227 +10981,231 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "innehåller"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "innehåller inte"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "slutar inte med"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "finns inte"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "finns inte"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "låter inte som"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "börjar inte med"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "finns inte"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Utkast"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "slutar med"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "finns"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Uttryck"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "är"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "är efter"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "är innan"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "Flaggad"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "är större än"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "är mindre än"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "är inte"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Flaggad"
-
-#: 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 "Sändlista"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "meddelandetext"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "meddelandehuvud"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Kör skalkommando"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spela ljud:"
 
 # [Status] [är] [Läst]
-#: 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äst"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Reguljärt uttryck matchar"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "besvarad"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "är större än"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "är mindre än"
+#: 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 "Poäng"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Avsändare"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Kör skalkommando"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "låter som"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Källkonto"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "börjar med"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stoppa 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 "Ämne"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Ställ in status"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "innehåller"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "innehåller inte"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "slutar inte med"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "finns inte"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "finns inte"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "låter inte som"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "börjar inte med"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "slutar med"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "finns"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "Flaggad"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "är efter"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "är innan"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "är större än"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "är mindre än"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Flaggad"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "är inte"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "är"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "är större än"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "är mindre än"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "låter som"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "börjar med"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regler"
@@ -11105,31 +11239,31 @@ msgstr "Du måste ange minst en mapp som källa."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerar din gamla Elm-epost"
 
-#: 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 "Importerar..."
 
-#: 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 "Var vänlig vänta"
 
-#: 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 "Importerar %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 "Genomsöker %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 "E-post"
 
@@ -11190,39 +11324,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 importerar din gamla Netscape-data"
 
 #. 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 "Papperskorg"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Genomsöker IMAP-mappen"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Genomsöker katalog"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Startar import"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Inställningar"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Redigera 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?"
@@ -11342,26 +11476,36 @@ msgid "Folder containing mail"
 msgstr "Mapp som innehåller e-post"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Publikt"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Mapp som innehåller e-post"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Virtuell papperskorg"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Virtuell papperskorgsmapp"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Denna mapp kan inte innehålla meddelanden."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: 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."
@@ -11369,78 +11513,79 @@ msgstr ""
 "En del av dina e-postinställningar verkar felaktiga, kontrollera att allt är "
 "som det ska vara."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Du har inte angivit någon e-posttransportmetod"
 
-#: 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 "Varning: Ändrat meddelande"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Skriv ett meddelande"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Nytt meddelande"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Skriv _ut meddelande"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nytt e-postmeddelande"
 
-#: 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 inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan inte initiera Evolutions e-postkonfigurationskomponent."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan inte initiera Evolutions mappinformationskomponent."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ansluter till server..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper för \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: 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 "Kunde inte skapa temporär katalog: %s"
@@ -11485,140 +11630,140 @@ msgstr "%d skickade"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Skapa _virtuell mapp från meddelande"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: 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 "Filtrera på sä_ndlista"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: 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_ra till avsändaren"
 
-#: 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 "Svara till _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 "Svara till _alla"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: 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 "Färdigt"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Ställ flagga"
 
 #. 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 "_Markera som läst"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markera som ovikti_gt"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Flytta till mapp..."
 
-#: 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 "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adressboken"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Skapa rege_l från meddelande"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Virtuell mapp på sändlista"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuell mapp på sändlista (%s)"
@@ -11691,20 +11836,20 @@ msgstr "Du har inte fyllt i all nödvändig information."
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: 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ärd:"
 
-#: 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 "Användar_namn:"
 
-#: 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ökväg:"
 
-#: 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 inte skapa två konton med samma namn."
 
@@ -11721,14 +11866,14 @@ msgid "Really delete account?"
 msgstr "Verkligen ta bort kontot?"
 
 #: 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 "Stäng av"
 
 #: 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 "Slå på"
 
@@ -11817,9 +11962,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 skickar ett HTML-formaterat brev, men följande mottagare vill inte ha "
 "HTML-formaterad e-post:\n"
@@ -11862,7 +12008,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Du måste ange mottagare för att kunna skicka detta meddelande."
 
-#: 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?"
@@ -11870,28 +12016,28 @@ msgstr ""
 "Kan inte öppna utkastmappen för detta konto.\n"
 "Vill du använda standardmappen för utkast?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
-#: 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 klockan %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 "Flytta meddelande(n) till"
 
-#: 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 "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Är du säker på att du vill redigera alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11899,7 +12045,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Utkast."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11907,39 +12053,39 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Skickat."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Är du säker på att du vill skicka om alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Inget meddelande markerat"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Visa nästa olästa meddelande"
 
-#: 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"
@@ -11952,7 +12098,7 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11961,65 +12107,65 @@ msgstr ""
 "Fel vid läsning av 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
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: 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 "Utskrift av meddelande misslyckades"
 
-#: 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 ""
 "Är du säker på att du vill öppna alla %d meddelanden i separata fönster?"
 
-#: 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 "_Säkerhet"
 
-#: 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 "Namnlös kontakt:"
 
-#: 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 "Spara signatur"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Spara signatur"
@@ -12080,16 +12226,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolutions 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 "Kontrollerar tjänst"
 
-#: 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 "Ansluter till server..."
 
@@ -12815,78 +12961,74 @@ msgstr "Kunde inte skapa ett S/MIME-kuvertsammanhang."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunde inte skapa ett S/MIME-avkodningssammanhang."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Spara bilaga"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kunde inte skapa temporärt meddelandefält \"%s\": %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Spara bilaga"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Visa inuti"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visa inuti (med %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Dölj"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Externt visningsprogram"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Läs in _bilder"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Läser in meddelandeinnehåll"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Objekt som skulle ha utförts:"
 
-#: 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 "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopiera länkplats"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Spara länk som (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
@@ -12895,107 +13037,108 @@ msgstr "Spara bild som..."
 msgid "Pinging %s"
 msgstr "Undersöker %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: 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 "Felaktig adress"
 
-#: 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 "Från"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: 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 "Till"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr "E-post"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Detta meddelande är digitalt signerat. Klicka på låsikonen för mer "
 "information."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kunde inte skapa ett PGP-verifieringssammanhang."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Detta meddelande är digitalt signerat och har befunnits äkta."
 
-#: 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 "Detta meddelande är digitalt signerat men äktheten kan inte bevisas."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjärrdata (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: 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 "Lokala mappar"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerar mapp"
 
-#: 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"
@@ -13004,27 +13147,22 @@ msgstr ""
 "Kan inte spara metainformation; du kommer antagligen att\n"
 "upptäcka att du inte kan öppna denna mapp längre: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan inte spara metainformation för mapp på %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan inte ta bort metainformation för mapp %s: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Byter format på mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s kan inte konfigureras om eftersom den inte är en lokal mapp"
-
-#: 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."
@@ -13032,15 +13170,15 @@ msgstr ""
 "Om du inte längre kan öppna denna brevlåda måste\n"
 "du kanske reparera den manuellt."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Du kan inte ändra formatet på en ickelokal mapp."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurera om /%s"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "Du kan inte ändra formatet på en ickelokal mapp."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13281,21 +13419,21 @@ msgstr "Väntar..."
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Kom ihåg detta lösenord"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Kom ihåg detta lösenord för resten av denna session"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ange lösenord för %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
@@ -13304,11 +13442,11 @@ msgstr "Ange lösenord"
 msgid "Could not save signature file: %s"
 msgstr "Kunde inte spara signaturfilen."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Spara 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"
@@ -13318,14 +13456,12 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: mail/mail-signature-editor.c:371
+#: mail/mail-signature-editor.c:372
 #, fuzzy
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
-"Skriv in namnet som du vill använda för att referera till dessa servrar, "
-"till exempel: \"Jobb\" eller \"Hemma\"."
+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 "Namn:"
 
@@ -13365,7 +13501,7 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: 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 "Virtuella mappar"
 
@@ -13395,67 +13531,67 @@ msgstr "(Inget ämne)"
 msgid "%s - Message"
 msgstr "%s - Meddelande"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Olä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 "Besvarad"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Högsta"
 
-#: 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 "Idag %H.%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Igå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 "Genererar meddelandelista"
 
@@ -13530,45 +13666,71 @@ msgstr "Svara till alla"
 msgid "Review"
 msgstr "Förhandsgranska"
 
-#: 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 "Färdigt"
+
+#: 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 "Ställ flagga"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Ska utföras "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Filnamn:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Genomsöker mappar under %s på \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Genomsöker mappar på rotnivå på \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prenumererar på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Säger upp prenumeration på mappen \"%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 "Mapp"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Spara i mapp..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Välj en server."
 
@@ -23472,12 +23634,12 @@ msgstr "%l.%M %d %B"
 msgid "No description"
 msgstr "Ingen beskrivning"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
-#: 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 "Lokala mappar"
 
@@ -23487,25 +23649,25 @@ msgstr "Lokala mappar"
 #. (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 "ESGG:ESMS:ESSA:ESNU"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dagens ord från dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Lägg till en nyhetskälla"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: 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 "Ange URL:en till den nyhetskälla som du vill lägga till"
 
@@ -23545,12 +23707,12 @@ msgid "My Weather"
 msgstr "Mitt väder"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "Ett fel uppstod när nyhetskällan hämtades"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Väder"
 
@@ -24878,6 +25040,11 @@ msgstr ""
 "Kan inte för över mapp:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Öppna i %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25120,12 +25287,25 @@ msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
 #: 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 "Det angivna mappnamnet är inte giltigt: %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 ""
+"Kan inte byta namn på mapp:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25134,12 +25314,12 @@ msgstr ""
 "Kan inte skapa den angivna katalogen:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Skapa _ny mapp..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Ny..."
 
@@ -25169,20 +25349,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Välj den information som du vill importera:"
 
-#. 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 ""
-"Importerar %s\n"
-"Importören är inte redo.\n"
-"Väntar 5 sekunder med nytt försök."
-
-#: 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"
@@ -25191,22 +25358,22 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Välj mapp"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s finns inte"
 
-#: 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-fel"
 
-#: 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"
@@ -25215,11 +25382,11 @@ msgstr ""
 "Det finns ingen importör som kan hantera\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25228,17 +25395,17 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Fel vid start av %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Fel vid inläsning av %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25247,31 +25414,31 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt 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 "Filnamn:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Filtyp:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Importera data och inställningar från äldre program"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importera en ensam 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"
@@ -25279,24 +25446,24 @@ msgstr ""
 "Var god vänta...\n"
 "Letar efter befintliga konfigurationer"
 
-#: 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 "Startar intelligenta importörer"
 
-#: 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 "Från %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Välj en destinationsmapp för importen av denna data"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importera"
 
@@ -25322,32 +25489,32 @@ msgstr "Synkroniserar mapp"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Synkroniserar \"%s\""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Inställningar för Mitt Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Öppnar mappen %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 "Öppnar mappen %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 "Öppna 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 "Kunde inte byta namn på mapp: %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 ""
@@ -25389,44 +25556,44 @@ msgstr "Mappnamnet kan inte innehålla snedstreck."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" och \"..\" är reserverade mappnamn."
 
-#: 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 hittades inte 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 kunde inte köras."
 
-#: 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å till mapp..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Markera den mapp som du vill öppna"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Skapa en ny genväg"
 
-#: 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älj den mapp som du vill att genvägen ska peka till:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: 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 "A_rbeta frånkopplad"
 
-#: 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 "Arbeta frånkopplad"
 
@@ -25434,27 +25601,27 @@ msgstr "Arbeta frånkopplad"
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: 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 är just nu ansluten. Klicka på denna knapp för att koppla "
 "frå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 håller på att koppla från."
 
-#: 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 ""
@@ -25473,12 +25640,12 @@ msgstr ""
 "Felet från aktiveringssystemet är:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan inte lägga upp lokal plats för sparande -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25489,19 +25656,19 @@ msgstr ""
 "oväntat avslutats. Du måste avsluta Evolution och starta om det\n"
 "för att komma åt den datan igen."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Allmänt fel"
 
@@ -25641,58 +25808,62 @@ msgstr "Genvägar"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Inga fel"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "En mapp med samma namn finns redan"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Den angivna mapptypen är inte giltig"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "I/O-fel"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Inte tillräckligt med utrymme för att skapa mapp"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Mappen är inte tom"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Den angivna mappen hittades inte"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funktionen är ännu inte implementerad i detta lager"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Åtgärden stöds inte"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivna typen stöds inte i detta lager"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den angivna mappen kan inte ändras eller tas bort"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan inte göra en mapp till barn av dess undermappar"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Kan inte skapa en mapp med det namnet"
 
+#: 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 (...)"
@@ -25907,9 +26078,10 @@ msgstr ""
 "Klicka på knappen \"Nästa\" för att fortsätta. "
 
 #: 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 ""
@@ -25928,26 +26100,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolutions importassistent"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolutions importörsassistent"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Importera fil (steg 3 av 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Importeringstyp (steg 1 av 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Välj importörer (steg 2 av 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Välj en fil (steg 2 av 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"
@@ -26176,10 +26344,10 @@ msgstr "Visa den aktuella kontakten"
 #: 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 "_Åtgärder"
 
@@ -26298,7 +26466,7 @@ msgid "Print this item"
 msgstr "Skriv ut detta objekt"
 
 #: 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 "Spara"
 
@@ -26325,7 +26493,7 @@ msgstr "Spara detta objekt till 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 "_Arkiv"
 
@@ -26407,7 +26575,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Boka ett möte för detta objekt"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Anpassa Mitt Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26457,29 +26626,30 @@ msgid "Post a message to a Public folder"
 msgstr "Kopiera meddelandet till en ny mapp"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Prenumerera på mappar..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Visa förhandsgranskningsfönster för meddelanden"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prenumerera eller säg upp prenumeration på mappar på fjärrservrar"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Redigerare för virtuella mappar..."
 
-#: 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 "F_örhandsgranskningspanel"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_Prenumerera på mappar..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Ändra egenskaperna för denna mapp"
@@ -26574,7 +26744,7 @@ msgstr "Trådad meddelandelista"
 msgid "_Expunge"
 msgstr "T_öm"
 
-#: 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 "_Mapp"
 
@@ -26892,7 +27062,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
 
 #: 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 "Ställ in sidinställningarna för din aktuella skrivare"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -27006,7 +27177,7 @@ msgstr "Citerad"
 msgid "_Resend..."
 msgstr "Skicka _om..."
 
-#: 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_erktyg"
 
@@ -27021,12 +27192,12 @@ msgstr "Stäng detta fönster"
 #: 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 "S_täng"
 
 #: 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 "_Visa"
 
@@ -27200,7 +27371,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Spara objektet och stäng dialogrutan"
 
-#: 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"
 
@@ -27367,7 +27538,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Skapa _ny mapp..."
 
 #: 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
@@ -27384,114 +27555,134 @@ msgid "Pi_lot Settings..."
 msgstr "_Pilotinställningar..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "_Pilotinställningar..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Skapa _ny mapp..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Skicka / Ta emot"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Skicka kölagd e-post och hämta ny e-post"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "E-postkonfiguration"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "E-postkonfiguration"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Visa information om Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Skicka en felrapport med Bug-Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Växla"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Växla om mappraden ska visas"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Växla om genvägsraden ska visas"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Växla om vi arbetar frånkopplade."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Visa den markerade mappen"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Frågor och _svar om Ximian Evolution"
 
-#: 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 "_Kopiera..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Mapprad"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Mapp"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Flytta..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nytt"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Ny mapp"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Inställningar för uppgifter..."
+msgid "_Remove Other User's Folder"
+msgstr "Skapa _ny mapp..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_E-postinställningar..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Genvägsrad"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Genväg"
@@ -27734,11 +27925,11 @@ msgstr "Teckenkodning"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Sökredigerare"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Spara sökning"
 
@@ -27818,6 +28009,59 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "Ta bort"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "Lägg till ->"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Letar efter nya meddelanden"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Mappen är inte 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 glömde välja en mapp.\n"
+#~ "Gå tillbaka och ange en giltig mapp som e-post kan levereras till."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s kan inte konfigureras om eftersom den inte är en lokal mapp"
+
+#, fuzzy
+#~ msgid "Type the name by which you would like to refer to this signature."
+#~ msgstr ""
+#~ "Skriv in namnet som du vill använda för att referera till dessa servrar, "
+#~ "till exempel: \"Jobb\" eller \"Hemma\"."
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importerar %s\n"
+#~ "Importören är inte redo.\n"
+#~ "Väntar 5 sekunder med nytt försök."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolutions importörsassistent"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Inställningar för uppgifter..."
+
 #~ msgid "Error in search expression."
 #~ msgstr "Fel i sökuttryck."
 
@@ -27860,15 +28104,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "Icke-deltagare"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Meddelandet har inte skickats än.\n"
-#~ "\n"
-#~ "Vill du spara dina ändringar?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (standard)"
@@ -28225,10 +28460,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Use _HTML for this signature"
 #~ msgstr "_HTML-signatur:"
 
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Filnamn:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML-signatur:"
 
@@ -28259,14 +28490,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Riga"
 #~ msgstr "Riga"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "Lägg till ->"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "Ta bort"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Är du säker på att du vill ta bort mappen \"%s\"?"
 
@@ -28657,10 +28880,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "seconds."
 #~ msgstr "sekunder."
 
-#, fuzzy
-#~ msgid "use _HTML for this signature"
-#~ msgstr "_HTML-signatur:"
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution känner inte igen denna typ av signerat meddelande."
 
@@ -28946,12 +29165,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Delete this Task"
 #~ msgstr "_Ta bort denna uppgift"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Ledig-/upptageninformation (%s till %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "iCalendar-information"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Ogiltig typ i \"body-contains\", förväntar sträng"
 
@@ -29100,9 +29313,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_Uppgift..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_E-postinställningar..."
-
 #~ msgid "Forward As"
 #~ msgstr "Vidarebefordra som"
 
diff --git a/po/tr.po b/po/tr.po
index f1c923213c..d4ffb8ac92 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.1.0.99\n"
-"POT-Creation-Date: 2002-06-19 17:07-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-08-04 01:48GMT+02:00\n"
 "Last-Translator: Görkem Çetin <gorkem@gelecek.com.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -10,2457 +10,8865 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr "LDIF dosyalarını Evolution'a aktarım mimarisi."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr "LDIF dosyalarını Evolution'a aktarır."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "VCard dosyalarını Evolution'a aktarım mimarisi."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "VCard dosyalarını Evolution'a aktarır."
+
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:356
+msgid "File As"
+msgstr "Farklı Dosyala"
+
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
+#: my-evolution/e-summary-table.c:59
+msgid "Name"
+msgstr "İsim"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:358
+msgid "Email"
+msgstr "E-posta"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+msgid "Primary"
+msgstr "İlk"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr "İlk"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/widgets/e-addressbook-view.c:390
+msgid "Assistant"
+msgstr "Yardımcı"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+msgid "Business"
+msgstr "Meslek"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+msgid "Bus"
+msgstr "Meşg"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+msgid "Callback"
+msgstr "Geri Arama"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+msgid "Company"
+msgstr "Şirket"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+msgid "Comp"
+msgstr "Şirk"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+msgid "Home"
+msgstr "Ev"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:365
+msgid "Organization"
+msgstr "Kurum"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
+msgid "Org"
+msgstr "Kur"
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+msgid "Mobile"
+msgstr "Cep"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+msgid "Car"
+msgstr "Araba"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/widgets/e-addressbook-view.c:370
+msgid "Business Fax"
+msgstr "İşyeri Faksı"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+msgid "Bus Fax"
+msgstr "İşy Faks"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/widgets/e-addressbook-view.c:371
+msgid "Home Fax"
+msgstr "Ev Faksı"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+msgid "Business 2"
+msgstr "2. Meslek"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+msgid "Bus 2"
+msgstr "Meşgul 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+msgid "Home 2"
+msgstr "2. ev"
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/widgets/e-addressbook-view.c:374
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+msgid "Other"
+msgstr "Diğer"
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/widgets/e-addressbook-view.c:376
+msgid "Other Fax"
+msgstr "Başka Fakslar"
+
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.c:377
+msgid "Pager"
+msgstr "Çağrı Cihazı"
+
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/widgets/e-addressbook-view.c:378
+msgid "Radio"
+msgstr "Radyo"
+
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/widgets/e-addressbook-view.c:379
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:380
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
+#: addressbook/gui/widgets/e-addressbook-view.c:382
+msgid "Email 2"
+msgstr "2. E-posta Adresi"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1780
+#: addressbook/gui/widgets/e-addressbook-view.c:383
+msgid "Email 3"
+msgstr "3. E-posta Adresi"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:384
+msgid "Web Site"
+msgstr "Web Sayfası"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+msgid "Url"
+msgstr "Url"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:385
+msgid "Department"
+msgstr "Bölüm"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+msgid "Dep"
+msgstr "Böl"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:386
+msgid "Office"
+msgstr "Ofis"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+msgid "Off"
+msgstr "Ofis"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:387
+msgid "Title"
+msgstr "Sıfat"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:388
+msgid "Profession"
+msgstr "Uzmanlık alanı"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+msgid "Prof"
+msgstr "Prof"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:389
+msgid "Manager"
+msgstr "Yönetici"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+msgid "Man"
+msgstr "Yön"
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+msgid "Ass"
+msgstr "Asis"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:391
+msgid "Nickname"
+msgstr "Lakap"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+msgid "Nick"
+msgstr "Lakap"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:392
+msgid "Spouse"
+msgstr "Eş"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:393
+msgid "Note"
+msgstr "Not"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr "Takvim URI"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "CALUri"
+msgstr "CALUri"
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:394
+msgid "Free-busy URL"
+msgstr "Web Sayfası"
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+msgid "FBUrl"
+msgstr "FBUrl"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Anniversary"
+msgstr "Yıldönümü"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Anniv"
+msgstr "Yıldön"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Birth Date"
+msgstr "Doğum Günü"
+
+#: addressbook/backend/ebook/e-card-simple.c:104
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategoriler"
+
+#: addressbook/backend/ebook/e-card-simple.c:105
+msgid "Family Name"
+msgstr "Tam İsim"
+
+#: addressbook/backend/ebook/e-card-simple.c:792
+#, c-format
+msgid "%x"
+msgstr "%x"
+
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "İsimsiz Bağlantı Listesi"
+
+#: addressbook/backend/ebook/e-card.c:2681
+msgid "Multiple VCards"
+msgstr "Çoklu VCard"
+
+#: addressbook/backend/ebook/e-card.c:2689
+#, c-format
+msgid "VCard for %s"
+msgstr "%s için VCard"
+
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:34
+#: addressbook/conduit/address-conduit.c:1860
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1807
+#: calendar/conduits/todo/todo-conduit.c:1385
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
+#: tools/evolution-addressbook-abuse.c:132
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo'yu başlatamadım"
+
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
+msgid "Searching..."
+msgstr "Aranıyor..."
+
+#: addressbook/backend/pas/pas-backend-file.c:366
+msgid "Loading..."
+msgstr "Yükleniyor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:687
+#, fuzzy
+msgid "Reconnecting to LDAP server..."
+msgstr "LDAP sunucuya bağlantı kuruluyor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
+msgid "Adding card to LDAP server..."
+msgstr "LDAP sunucuya kart ekleniyor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
+msgid "Removing card from LDAP server..."
+msgstr "LDAP sunucudaki kart siliniyor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
+msgid "Modifying card from LDAP server..."
+msgstr "LDAP sunucudaki kart düzenleniyor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
+msgid "Receiving LDAP search results..."
+msgstr "LDAP arama sonuçları alınıyor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#, fuzzy
+msgid "Error performing search"
+msgstr "Kartı silerken bir hata oluştu"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "_E-posta Adresi:"
+
+#: addressbook/conduit/address-conduit.c:536
+msgid "Cursor could not be loaded\n"
+msgstr "İmleç yüklenemedi\n"
+
+#: addressbook/conduit/address-conduit.c:549
+msgid "EBook not loaded\n"
+msgstr "EBook yüklenmedi\n"
+
+#: addressbook/conduit/address-conduit.c:1354
+#: calendar/conduits/calendar/calendar-conduit.c:1278
+#: calendar/conduits/todo/todo-conduit.c:889
+msgid "Could not start wombat server"
+msgstr "wombat sunucusu başlatılamadı"
+
+#: addressbook/conduit/address-conduit.c:1355
+#: calendar/conduits/calendar/calendar-conduit.c:1279
+#: calendar/conduits/todo/todo-conduit.c:890
+msgid "Could not start wombat"
+msgstr "Wombat başlatılamadı"
+
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
+msgid "Could not read pilot's Address application block"
+msgstr "Pilot adres uygulama defteri okunamadı"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Adres menüsü için Bonobo denetleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Adres gösteren örnek bir Bonobo denetleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Adres defteri gösteren örnek bir Bonobo denetleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolution adres defteri mini kartını gösteren denetleyici."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution Adres Defteri mini kart görüntüleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Evolution component for handling contacts."
+msgstr "Bağlantıları düzenleyen Evolution bileşeni."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Adres defteri mini kart mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Adres defteri isim gösterim arayüzü mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+msgid "Factory for the Addressbook's address popup"
+msgstr "Adres defteri menüsü mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the sample Addressbook control"
+msgstr "Örnek adres defteri kontrol mimarisi"
+
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:611
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
+msgid "Contacts"
+msgstr "Bağlantılar"
+
+#: addressbook/gui/component/addressbook-component.c:73
+msgid "Folder containing contact information"
+msgstr "Bağlantı bilgisini içeren dizin"
+
+#: addressbook/gui/component/addressbook-component.c:75
+msgid "LDAP Server"
+msgstr "LDAP Sunucusu"
+
+#: addressbook/gui/component/addressbook-component.c:75
+msgid "LDAP server containing contact information"
+msgstr "Bağlantı bilgisini içeren LDAP sunucusu"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Bağlantılar"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Bağlantı bilgisini içeren dizin"
+
+#: addressbook/gui/component/addressbook-component.c:567
+msgid "New Contact"
+msgstr "Yeni Bağlantı"
+
+#: addressbook/gui/component/addressbook-component.c:567
+msgid "_Contact"
+msgstr "_Bağlantı"
+
+#: addressbook/gui/component/addressbook-component.c:568
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Yeni bir bağlantı yarat"
+
+#: addressbook/gui/component/addressbook-component.c:571
+msgid "New Contact List"
+msgstr "Yeni Bağlantı Listesi"
+
+#: addressbook/gui/component/addressbook-component.c:571
+#, fuzzy
+msgid "Contact _List"
+msgstr "B_ağlantı Listesi"
+
+#: addressbook/gui/component/addressbook-component.c:572
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Yeni bir bağlantı listesi yarat"
+
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "LDAP sunucuyla bağlantı başarısız oldu"
+
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"IMAP sunucuyla kimlik denetimi başarısız oldu\n"
+"%s\n"
 "\n"
-"\n"
-"Bu bakışta gösterilecek öğe yok"
 
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1154
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1176
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Filtre bilgisini yüklerken hata oluştu:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1184
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
+
+#: addressbook/gui/component/addressbook-config.c:1640
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
+
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
+msgid "Could not initialize gnome-vfs"
+msgstr "Gnome-vfs başlatılamıyor"
+
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Diğer Bağlantılar"
+
+#: addressbook/gui/component/addressbook.c:474
+msgid "Unable to open addressbook"
+msgstr "Adres defterini açamadım"
+
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
 msgstr ""
-"\n"
-"\n"
-"Bu bakışta gösterilecek öğe yok\n"
-"\n"
-"Buraya çift tıklayarak bir bağlantı yaratın."
+"Bu adres defteri açılamadı. Yeterli izin haklarına sahip olup\n"
+"olmadığınızı ve dosyanın yerini kontrol edin."
 
+#: addressbook/gui/component/addressbook.c:490
+#, fuzzy
 msgid ""
-"\n"
-"  Additional: "
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is unreachable."
 msgstr ""
-"\n"
-"  Ek: "
+"Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
+"ya da LDAP sunucusu erişilemiyor olabilir."
 
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
-"\n"
-"  Country:     "
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
 msgstr ""
-"\n"
-"  Ülke:        "
+"Evolution'ın bu sürümünde LDAP desteği bulunmuyor. \n"
+"Eğer Evolution'ı LDAP desteği ile kullanmak istiyorsanız,\n"
+"programı CVS kaynaklarından alacağınız openLDAP desteği\n"
+"ile kurmalısınız:\n"
 
+#: addressbook/gui/component/addressbook.c:504
+#, fuzzy
 msgid ""
-"\n"
-"  Family:     "
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the server\n"
+"is unreachable."
+msgstr ""
+"Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
+"ya da LDAP sunucusu erişilemiyor olabilir."
+
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
 msgstr ""
-"\n"
-"  Aile:     "
 
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr "Sertifika denetlenemedi."
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s için parolayı girin (kullanıcı: %s)"
+
+#: addressbook/gui/component/addressbook.c:782
+msgid "Name begins with"
+msgstr "İsim başlar"
+
+#: addressbook/gui/component/addressbook.c:783
+#, fuzzy
+msgid "Email begins with"
+msgstr "İsim başlar"
+
+#: addressbook/gui/component/addressbook.c:784
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Kategori"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:785
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Herhangi bir alanın içeriği"
+
+#: addressbook/gui/component/addressbook.c:786
+msgid "Advanced..."
+msgstr "Gelişmiş..."
+
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
-"\n"
-"  Name:  "
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
 msgstr ""
-"\n"
-"  İsim:  "
 
+#: addressbook/gui/component/addressbook.c:962
 msgid ""
-"\n"
-"  Postal Code: "
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
 msgstr ""
-"\n"
-"  Posta Kutusu:"
 
+#: addressbook/gui/component/addressbook.c:968
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:971
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:975
+msgid "This query did not complete successfully."
+msgstr ""
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1050
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr "Herhangi bir Kategori"
+
+#: addressbook/gui/component/addressbook.c:1132
+msgid "The URI that the Folder Browser will display"
+msgstr "Dizin tarayıcısının göstereceği URI"
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(hiçbiri)"
+
+#: addressbook/gui/component/e-address-popup.c:474
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+msgid "Primary Email"
+msgstr "Birincil E-posta Adresi"
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr "Bir Eylem Seçin"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Yeni bir bağlantı yarat: \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "\"%s\" bağlantısına adres ekle"
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr "Adres Defterini Araştırılıyor..."
+
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr "Bağlantı Bilgisini Düzenle"
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr "Bağlantılara Ekle"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr "E-posta Adresini Birleştir"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr "Aramaları Kapat"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Enable Queries (Dangerous!)"
+msgstr "Aramaları Etkinleştir (Tehlikeli!)"
+
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr "_Desteklenen türleri denetle "
+
+#: addressbook/gui/component/ldap-config.glade.h:2
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "1:00"
+msgstr "%100"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+#, fuzzy
+msgid "380"
+msgstr "%80"
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "636"
+msgstr ""
+
+#: 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çenekler"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Addressbook Sources"
+msgstr "Adres Defteri Kaynakları"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Always"
+msgstr "Albany"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonim"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid ""
+"Congratulations, you are finished setting up this LDAP server. You\n"
+"are now ready to access this directory.\n"
 "\n"
-"  Prefix:     "
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
 msgstr ""
-"\n"
-"  Önek:     "
 
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "Connecticut"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "Bilgi Yok"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_Sil"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Liste adı:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "_E-posta Adresi:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution Alarmı"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
-"\n"
-"  Suffix:     "
+"Evolution will use this email address to authenticate you with the server"
 msgstr ""
-"\n"
-"  Sonek:     "
 
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Bul:"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Genel"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Yapılandırma"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marjin"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "Denver"
+
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
-"\n"
-"Address:"
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to "
+"cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
 msgstr ""
-"\n"
-"Adres:"
 
+#: addressbook/gui/component/ldap-config.glade.h:41
+msgid "Objectclasses"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:44
+msgid "One"
+msgstr "Biri"
+
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"\n"
-"Birth Date: "
+"Please select an Evolution attribute and an\n"
+"LDAP attribute to associate with it."
 msgstr ""
-"\n"
-"Doğum Günü: "
 
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"\n"
-"Categories: "
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
 msgstr ""
-"\n"
-"Kategoriler: "
 
+#: addressbook/gui/component/ldap-config.glade.h:49
+msgid "R_estore Defaults"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:50
+msgid "Re_store Defaults"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "İle_tide Ara..."
+
+#. No time range is set, so don't start a query
+#: addressbook/gui/component/ldap-config.glade.h:52
+#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1242
+msgid "Searching"
+msgstr "Arıyor"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#, fuzzy
+msgid "Select"
+msgstr "Hepsini Seç"
+
+#: addressbook/gui/component/ldap-config.glade.h:54
+#, fuzzy
+msgid "Selected:"
+msgstr "Silinen"
+
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
-"\n"
-"Comment: "
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
+"your LDAP server supports SSL or TLS."
 msgstr ""
-"\n"
-"Açıklama: "
 
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
-"\n"
-"E-mail:\n"
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
 msgstr ""
-"\n"
-"E-posta:\n"
 
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
-"\n"
-"Name: "
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
 msgstr ""
-"\n"
-"İsim:"
 
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
-"\n"
-"Public Key: "
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
 msgstr ""
-"\n"
-"Genel Anahtar: "
 
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"\n"
-"Telephone:"
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
 msgstr ""
-"\n"
-"Telefon:"
 
+#: addressbook/gui/component/ldap-config.glade.h:67
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "Kaynak Bilgisi"
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Sunucuya bağlantı kuruluyor..."
+
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "Step 3: Searching the Directory"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+msgid "Step 4: Display Name"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:71
+#, fuzzy
+msgid "Sub"
+msgstr "Pz"
+
+#: addressbook/gui/component/ldap-config.glade.h:72
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Desteklenmeyen şema"
+
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
-"\n"
-"Telephones:\n"
+"The first step in configuring an LDAP server is to provide its name, and "
+"your log in\n"
+"information. Please ask your system administrator if you are unsure of this "
+"information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:75
+msgid ""
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
+"need to change these options."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:78
+msgid ""
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
 msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:80
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base."
+msgstr ""
+
+#: 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"
 "\n"
-"Telefonlar:\n"
+"Adding a new LDAP server requires some specialized information\n"
+"about the server. Please contact your system administrator if you \n"
+"need help finding this information."
+msgstr ""
 
-msgid " (Completed "
-msgstr " (Tamamlanan "
+#: addressbook/gui/component/ldap-config.glade.h:89
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
 
-msgid " (default)"
-msgstr " (öntanımlı)"
+#: 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 ""
 
-msgid " C"
-msgstr " C"
+#: 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 ""
 
-msgid " F"
-msgstr " F"
+#: 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 ""
 
-msgid " _Check for supported types "
-msgstr "_Desteklenen türleri denetle "
+#: 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"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
+msgstr ""
 
-msgid " _Refresh List "
-msgstr "_Listeyi Tazele "
+#: addressbook/gui/component/ldap-config.glade.h:98
+msgid "This option controls how long a search will be run."
+msgstr ""
 
-msgid " _Remove"
-msgstr " _Sil"
+#: 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"
+"Any values that you add to the DN will become required values for any new "
+"contacts\n"
+"that you add to the directory on the LDAP server. "
+msgstr ""
 
-msgid " color"
-msgstr " rengi ile göster"
+#: addressbook/gui/component/ldap-config.glade.h:102
+msgid "U_se SSL/TLS:"
+msgstr ""
 
-msgid "% Complete"
-msgstr "Biten %"
+#: addressbook/gui/component/ldap-config.glade.h:103
+msgid "Using distinguished name (DN)"
+msgstr ""
 
-msgid "%.1fG"
-msgstr "%.1fG"
+#: addressbook/gui/component/ldap-config.glade.h:104
+#, fuzzy
+msgid "Using email address"
+msgstr "_E-posta adresi:"
 
-msgid "%.1fK"
-msgstr "%.1fK"
+#: addressbook/gui/component/ldap-config.glade.h:105
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+msgid "Whenever Possible"
+msgstr ""
 
-msgid "%.1fM"
-msgstr "%.1fM"
+#: 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
+#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+msgid "_Add"
+msgstr "_Ekle"
 
-msgid "%02i minute divisions"
-msgstr "%02i dakika bölmeleri"
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Ekle"
 
-msgid "%A %d %B"
-msgstr "%d %B %A"
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Eylem ekle"
 
-msgid "%A %d %B %Y"
-msgstr "%d %B %A %Y"
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Eylem ekle"
 
-msgid "%A, %B %d, %Y"
-msgstr "%d %B %A, %Y"
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Always"
+msgstr "Uyarılar"
 
-msgid "%A, %B %e %Y"
-msgstr "%e %B %A, %Y"
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "He_psini sil"
 
-msgid "%B %Y"
-msgstr "%B %Y"
+#: addressbook/gui/component/ldap-config.glade.h:112
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Göster"
 
-msgid "%H:%M"
-msgstr "%H:%M"
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Distinguished Name (DN):"
+msgstr ""
 
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#: addressbook/gui/component/ldap-config.glade.h:114
+msgid "_Don't use SSL/TLS"
+msgstr ""
 
-msgid "%I %p"
-msgstr "%I %p"
+#: addressbook/gui/component/ldap-config.glade.h:115
+msgid "_Download limit:"
+msgstr ""
 
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#: 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
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
+msgid "_Edit"
+msgstr "_Düzenle"
 
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
+#: addressbook/gui/component/ldap-config.glade.h:117
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Toplantıyı düzenle"
 
-msgid "%P %%"
-msgstr "%P %% "
+#: addressbook/gui/component/ldap-config.glade.h:118
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution Alarmı"
 
-msgid "%a %b %d"
-msgstr "%d %b %a"
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_If necessary "
+msgstr ""
 
-msgid "%a %b %d %Y"
-msgstr "%d %b %a %Y"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_LDAP attribute:"
+msgstr ""
 
-msgid "%a %d %Y"
-msgstr "%d %a %Y"
+#: addressbook/gui/component/ldap-config.glade.h:121
+msgid "_LDAP attributes:"
+msgstr ""
 
-msgid "%a %d %b"
-msgstr "%d %b %a"
+#: addressbook/gui/component/ldap-config.glade.h:122
+msgid "_Log in method:"
+msgstr ""
 
-msgid "%a %d %b %Y"
-msgstr "%d %b %a %Y"
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Seçenekler"
 
-msgid "%a %l:%M %p"
-msgstr "%a %l %M %p"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Port:"
 
-msgid "%a %m/%d/%Y"
-msgstr "%d %b %Y %a"
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Restore Defaults"
+msgstr ""
 
-msgid "%a %m/%d/%Y %H"
-msgstr "%d/%m/%Y %A %H"
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Search base:"
+msgstr "_Ara"
 
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y %A %H:%M"
+#: addressbook/gui/component/ldap-config.glade.h:127
+msgid "_Server name:"
+msgstr "_Sunucu adı:"
 
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%d/%m/%Y %A %H:%M:%S"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Dinlenme zamanı (dakika)"
 
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%d/%m/%Y %A %I %p"
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "account-druid"
+msgstr "Hesap %d"
 
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%d/%m/%Y %A %I:%M %p"
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "account-editor"
+msgstr "bağlantı-listesi-editörü"
 
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%d/%m/%Y %A %I:%M:%S %p"
+#: addressbook/gui/component/ldap-config.glade.h:131
+#, fuzzy
+msgid "cards"
+msgstr "%d kart"
 
-msgid "%b %d %Y"
-msgstr "%d %b %Y"
+#: addressbook/gui/component/ldap-config.glade.h:132
+#, fuzzy
+msgid "connecting-tab"
+msgstr "%s adresine bağlantı kuruluyor"
 
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
+#: addressbook/gui/component/ldap-config.glade.h:133
+msgid "dn-customization-tab"
+msgstr ""
 
-msgid "%d %B"
-msgstr "%d %B"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "edit_server_window_simple"
+msgstr ""
 
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
+#: addressbook/gui/component/ldap-config.glade.h:135
+#, fuzzy
+msgid "general-tab"
+msgstr "Genel"
 
-msgid "%d %b"
-msgstr "%d %b"
+#: addressbook/gui/component/ldap-config.glade.h:136
+msgid "mappings-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:137
+msgid "objectclasses-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:138
+#, fuzzy
+msgid "searching-tab"
+msgstr "Arıyor"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution adres defteri isim seçme arayüzü."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Adres defteri isim seçim arayüzü mimarisi"
+
+#. Fixme: Ditto
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: 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"
+msgstr "Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
+msgid "Remove All"
+msgstr "Tümünü Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
+msgid "Send HTML Mail?"
+msgstr "HTML Posta Gönderilsin mi?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
+msgid "Edit Contact List"
+msgstr "Bağ_lantı Listesini Düzenle"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
+msgid "Unnamed Contact List"
+msgstr "İsimsiz Bağlantı Listesi"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
+#, c-format
+msgid "(%d not shown)"
+msgstr "(%d adet gösterilmiyor)"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+msgid "Unnamed Contact"
+msgstr "İsimsiz Bağlantı"
+
+#: addressbook/gui/component/select-names/e-select-names.c:514
+msgid "Select Contacts from Addressbook"
+msgstr "Adres Defterinden Bağlantıları Seç"
+
+#: addressbook/gui/component/select-names/e-select-names.c:576
+#, fuzzy
+msgid "Find contact in"
+msgstr "Gönderen içerir"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Select Names"
+msgstr "İsimleri Seçin"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Bağlantıyı Sil?"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Bağlantılar"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid ""
+"Type a name into the entry, or\n"
+"select one from the list below:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "_Category:"
+msgstr "_Kategori:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "_Folder:"
+msgstr "_Dizin:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "A_ssistant's name:"
+msgstr "_Sekreterinin adı:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "Add_ress..."
+msgstr "_Adres..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Anni_versary:"
+msgstr "_Yıldönümü:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "Birthda_y:"
+msgstr "_Doğum günü:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "C_ontacts..."
+msgstr "_Bağlantılar..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Kategoriler..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#, fuzzy
+msgid "Collaboration"
+msgstr "Clarion"
+
+#. Construct the app
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+msgid "Contact Editor"
+msgstr "Bağlantı Düzenleyici"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "D_epartment:"
+msgstr "_Bölüm:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: calendar/gui/dialogs/task-editor.c:211
+msgid "Details"
+msgstr "Ayrıntılar"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+msgid "F_ree/Busy URL:"
+msgstr "_Boş/Meşgul URL:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "File A_s:"
+msgstr "Farklı _Dosya:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Full _Name..."
+msgstr "_Tam İsim..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+msgid "New phone type"
+msgstr "Yeni telefon türü"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+msgid "No_tes:"
+msgstr "_Notlar:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "Organi_zation:"
+msgstr "_Kurum:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+msgid "P_rofession:"
+msgstr "_Uzmanlık alanı:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "Phone Types"
+msgstr "Telefon Türleri"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "Eş"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "This is the _mailing address"
+msgstr "_Bu mektuplaşma adresidir"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "_HTML e-postalarını kabul ediyor"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c: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:48
+msgid "_Delete"
+msgstr "_Sil"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Job title:"
+msgstr "_Meslek tanımı:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Manager's Name:"
+msgstr "_Menejerinin adı:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+msgid "_Nickname:"
+msgstr "_Lakap:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Office:"
+msgstr "_Ofis:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "_Public Calendar URL:"
+msgstr "_Genel Takvim URL:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "_Web page address:"
+msgstr "W_eb sayfası adresi:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: my-evolution/Locations.h:2341
+msgid "United States"
+msgstr "Amerika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: my-evolution/Locations.h:42
+#, fuzzy
+msgid "Albania"
+msgstr "Albany"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: my-evolution/Locations.h:54
+msgid "Algeria"
+msgstr "Arnavutluk"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+msgid "American Samoa"
+msgstr "Samoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+msgid "Andorra"
+msgstr "Andora"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+msgid "Angola"
+msgstr "Angola"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+msgid "Antarctica"
+msgstr "Antarktika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+msgid "Antigua And Barbuda"
+msgstr "Antigua ve Barbuda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: my-evolution/Locations.h:120
+msgid "Argentina"
+msgstr "Arjantin"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+msgid "Armenia"
+msgstr "Ermenistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+msgid "Aruba"
+msgstr "Aruba"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: my-evolution/Locations.h:154
+msgid "Australia"
+msgstr "Avusturalya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: my-evolution/Locations.h:155
+msgid "Austria"
+msgstr "Avusturya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+msgid "Azerbaijan"
+msgstr "Azerbaycan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: my-evolution/Locations.h:161
+msgid "Bahamas"
+msgstr "Bahamalar"
+
+#: 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:148
+msgid "Bangladesh"
+msgstr "Bangladeş"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+msgid "Barbados"
+msgstr "Barbados"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+msgid "Belarus"
+msgstr "Belarus"
+
+#: 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:152
+#: my-evolution/Locations.h:218
+msgid "Belize"
+msgstr "Belize"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+msgid "Benin"
+msgstr "Benin"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: my-evolution/Locations.h:270
+msgid "Bolivia"
+msgstr "Bolivya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+msgid "Bosnia And Herzegowina"
+msgstr "Bosna Hersek"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+msgid "Botswana"
+msgstr "Botswana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+msgid "Bouvet Island"
+msgstr "Bouvet Island"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: my-evolution/Locations.h:294
+msgid "Brazil"
+msgstr "Brezilya"
+
+#: 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:162
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: my-evolution/Locations.h:320
+msgid "Bulgaria"
+msgstr "Bulgaristan"
+
+#: 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:165
+msgid "Burundi"
+msgstr "Burundi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+msgid "Cambodia"
+msgstr "Kamboçya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#: 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:169
+msgid "Cape Verde"
+msgstr "Cape Verde"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: my-evolution/Locations.h:389
+msgid "Cayman Islands"
+msgstr "Cayman Adaları"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+msgid "Central African Republic"
+msgstr "Orta Afrika Cumhuriyeti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+msgid "Chad"
+msgstr "Çad"
+
+#: 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:174
+msgid "China"
+msgstr "Çin"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: my-evolution/Locations.h:451
+msgid "Christmas Island"
+msgstr "Christmas Island"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+msgid "Cocos (Keeling) Islands"
+msgstr "Cocos (Keeling) Adaları"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: my-evolution/Locations.h:483
+msgid "Colombia"
+msgstr "Kolombiya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+msgid "Comoros"
+msgstr "Comoros"
+
+#: 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:181
+msgid "Cook Islands"
+msgstr "Cook Adaları"
+
+#: 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:183
+msgid "Cote d'Ivoire"
+msgstr "Cote d'Ivoire"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: my-evolution/Locations.h:528
+msgid "Croatia"
+msgstr "Hırvatistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: my-evolution/Locations.h:532
+msgid "Cuba"
+msgstr "Küba"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: my-evolution/Locations.h:545
+msgid "Cyprus"
+msgstr "Kıbrıs"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: my-evolution/Locations.h:546
+msgid "Czech Republic"
+msgstr "Çek Cumhuriyeti"
+
+#: 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:189
+msgid "Djibouti"
+msgstr "Cibuti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+msgid "Dominica"
+msgstr "Dominik"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: my-evolution/Locations.h:608
+msgid "Dominican Republic"
+msgstr "Dominik Cumhuriyeti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+msgid "East Timor"
+msgstr "Doğu Timur"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: my-evolution/Locations.h:641
+msgid "Ecuador"
+msgstr "Ekvator"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: my-evolution/Locations.h:650
+msgid "Egypt"
+msgstr "Mısır"
+
+#: 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:196
+msgid "Equatorial Guinea"
+msgstr "Equatorial Guinea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: my-evolution/Locations.h:684
+msgid "Estonia"
+msgstr "Estonya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+msgid "Ethiopia"
+msgstr "Etiyopya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+msgid "Falkland Islands"
+msgstr "Falkland Adaları"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+msgid "Faroe Islands"
+msgstr "Faroe Adaları"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+msgid "Fiji"
+msgstr "Fiji"
+
+#: 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:204
+#: my-evolution/Locations.h:766
+msgid "France"
+msgstr "Fransa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+msgid "French Guiana"
+msgstr "Fransız Guyanası"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+msgid "French Polynesia"
+msgstr "Fransız Polinezyası"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+msgid "French Southern Territories"
+msgstr "French Southern Territories"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+msgid "Gabon"
+msgstr "Gabon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+msgid "Gambia"
+msgstr "Gambia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: my-evolution/Locations.h:811
+msgid "Georgia"
+msgstr "Gürcistan"
+
+#: 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:212
+msgid "Ghana"
+msgstr "Gana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: my-evolution/Locations.h:815
+msgid "Gibraltar"
+msgstr "Cebelitarık"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: my-evolution/Locations.h:846
+msgid "Greece"
+msgstr "Yunanistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+msgid "Greenland"
+msgstr "Grönland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+msgid "Grenada"
+msgstr "Granada"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+msgid "Guam"
+msgstr "Guam"
+
+#: 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:220
+msgid "Guinea"
+msgstr "Gine"
+
+#: 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:222
+msgid "Guyana"
+msgstr "Guyana"
+
+#: 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:224
+msgid "Heard And McDonald Islands"
+msgstr "Heard And McDonald Adaları"
+
+#: 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:226
+#: my-evolution/Locations.h:945
+msgid "Honduras"
+msgstr "Honduras"
+
+#: 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:228
+#: my-evolution/Locations.h:966
+msgid "Hungary"
+msgstr "Macaristan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: my-evolution/Locations.h:978
+msgid "Iceland"
+msgstr "İzlanda"
+
+#: 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:231
+msgid "Indonesia"
+msgstr "İndonezya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: my-evolution/Locations.h:1007
+msgid "Ireland"
+msgstr "İrlanda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+msgid "Israel"
+msgstr "İsrail"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: my-evolution/Locations.h:1016
+msgid "Italy"
+msgstr "İtalya"
+
+#: 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:236
+#: my-evolution/Locations.h:1035
+msgid "Japan"
+msgstr "Japonya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: my-evolution/Locations.h:1046
+msgid "Jordan"
+msgstr "Ürdün"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Kazakhstan"
+msgstr "Kazakistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+msgid "Kenya"
+msgstr "Kenya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#, fuzzy
+msgid "Korea, Republic Of"
+msgstr "Korea, Republic of"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: my-evolution/Locations.h:1146
+msgid "Kuwait"
+msgstr "Kuveyt"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+msgid "Kyrgyzstan"
+msgstr "Kırgızistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+msgid "Laos"
+msgstr "Laos"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+msgid "Latvia"
+msgstr "Latvia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1197
+msgid "Lebanon"
+msgstr "Lübnan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1217
+msgid "Liberia"
+msgstr "Liberya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+msgid "Liechtenstein"
+msgstr "Lihtenştayn"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: my-evolution/Locations.h:1233
+msgid "Lithuania"
+msgstr "Litvanya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: my-evolution/Locations.h:1267
+msgid "Luxembourg"
+msgstr "Lüksemburg"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+msgid "Macau"
+msgstr "Macau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+msgid "Macedonia"
+msgstr "Makedonya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+msgid "Malawi"
+msgstr "Malawi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+msgid "Malaysia"
+msgstr "Malezya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+msgid "Maldives"
+msgstr "Maldivler"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+msgid "Mali"
+msgstr "Mali"
+
+#: 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:260
+msgid "Marshall Islands"
+msgstr "Marshall Adaları"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+msgid "Martinique"
+msgstr "Martinik"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+msgid "Mauritania"
+msgstr "Moritanya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+msgid "Mauritius"
+msgstr "Maritus"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: 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:266
+msgid "Micronesia"
+msgstr "Mikronezya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#, fuzzy
+msgid "Moldova, Republic Of"
+msgstr "Korea, Republic of"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+msgid "Monaco"
+msgstr "Monako"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+msgid "Mongolia"
+msgstr "Moğolistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: my-evolution/Locations.h:1469
+msgid "Morocco"
+msgstr "Morocco"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+msgid "Mozambique"
+msgstr "Mozambik"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+msgid "Namibia"
+msgstr "Namibya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+msgid "Nauru"
+msgstr "Nauru"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+msgid "Nepal"
+msgstr "Nepal"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: my-evolution/Locations.h:1530
+msgid "Netherlands"
+msgstr "Hollanda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+msgid "Netherlands Antilles"
+msgstr "Hollanda Antilleri"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+msgid "New Caledonia"
+msgstr "Yeni Kaledonya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: my-evolution/Locations.h:1559
+msgid "New Zealand"
+msgstr "Yeni Zelanda"
+
+#: 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:282
+msgid "Niger"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+msgid "Nigeria"
+msgstr "Nijerya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+msgid "Niue"
+msgstr "Niue"
+
+#: 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:286
+msgid "Northern Mariana Islands"
+msgstr "Northern Mariana Adaları"
+
+#: 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:288
+#: my-evolution/Locations.h:1631
+msgid "Oman"
+msgstr "Oman"
+
+#: 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:290
+msgid "Palau"
+msgstr "Palau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+msgid "Palestinian Territory"
+msgstr "Filistan Bölgesi"
+
+#: 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:293
+msgid "Papua New Guinea"
+msgstr "Papua Yeni Gine"
+
+#: 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:295
+#: my-evolution/Locations.h:1722
+msgid "Peru"
+msgstr "Peru"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+msgid "Philippines"
+msgstr "Filipinler"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1763
+msgid "Poland"
+msgstr "Polonya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1790
+msgid "Portugal"
+msgstr "Portekiz"
+
+#: 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:301
+#: my-evolution/Locations.h:1835
+msgid "Qatar"
+msgstr "Katar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+msgid "Reunion"
+msgstr "Reunion"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1910
+msgid "Romania"
+msgstr "Romanya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+msgid "Russian Federation"
+msgstr "Rusya Federasyonu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+msgid "Rwanda"
+msgstr "Ruanda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+msgid "Saint Kitts And Nevis"
+msgstr "Saint Kitts And Nevis"
+
+#: 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:308
+msgid "Saint Vincent And The Grena-dines"
+msgstr "Saint Vincent And The Grena-dines"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+msgid "Samoa"
+msgstr "Samoa"
+
+#: 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:311
+msgid "Sao Tome And Principe"
+msgstr "Sao Tome And Principe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: my-evolution/Locations.h:2033
+msgid "Saudi Arabia"
+msgstr "Suudi Arabistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+msgid "Senegal"
+msgstr "Senegal"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+msgid "Seychelles"
+msgstr "Seyşeller"
+
+#: 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:316
+#: my-evolution/Locations.h:2088
+msgid "Singapore"
+msgstr "Singapur"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2101
+msgid "Slovakia"
+msgstr "Slovakya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: my-evolution/Locations.h:2102
+msgid "Slovenia"
+msgstr "Slovenya"
+
+#: 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:320
+msgid "Somalia"
+msgstr "Somali"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2117
+msgid "South Africa"
+msgstr "Güney Afrika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+msgid "South Georgia And The South Sandwich Islands"
+msgstr "South Georgia And The South Sandwich Adaları"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2125
+msgid "Spain"
+msgstr "İspanya"
+
+#: 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:325
+msgid "St. Helena"
+msgstr "St. Helena"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "St. Pierre And Miquelon"
+msgstr "St. Pierre And Miquelon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+msgid "Sudan"
+msgstr "Sudan"
+
+#: 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:329
+msgid "Svalbard And Jan Mayen Islands"
+msgstr "Svalbard And Jan Mayen Adaları"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+msgid "Swaziland"
+msgstr "Swaziland"
+
+#: 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:332
+#: my-evolution/Locations.h:2181
+msgid "Switzerland"
+msgstr "İsviçre"
+
+#: 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:334
+msgid "Tajikistan"
+msgstr "Tacikistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#, fuzzy
+msgid "Tanzania, United Republic Of"
+msgstr "Tanzanya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+msgid "Thailand"
+msgstr "Tayland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+msgid "Togo"
+msgstr "Togo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+msgid "Tonga"
+msgstr "Tonga"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+msgid "Trinidad And Tobago"
+msgstr "Trinidad ve Tobago"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+msgid "Tunisia"
+msgstr "Tunus"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: my-evolution/Locations.h:2319
+msgid "Turkey"
+msgstr "Türkiye"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+msgid "Turkmenistan"
+msgstr "Türkmenistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+msgid "Turks And Caicos Islands"
+msgstr "Turks And Caicos Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+msgid "Uganda"
+msgstr "Uganda"
+
+#: 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:348
+msgid "United Arab Emirates"
+msgstr "Birleşik Arap Emirlikleri"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2340
+msgid "United Kingdom"
+msgstr "Birleşik Krallık"
+
+#: 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:351
+#: my-evolution/Locations.h:2346
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+msgid "Uzbekistan"
+msgstr "Özbekistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: 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:355
+#: my-evolution/Locations.h:2390
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "Virgin Islands, ABD"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "Virgin Islands, ABD"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+msgid "Wallis And Futuna Islands"
+msgstr "Wallis And Futuna Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+msgid "Western Sahara"
+msgstr "Western Sahara"
+
+#: 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:361
+#: my-evolution/Locations.h:2522
+msgid "Yugoslavia"
+msgstr "Yugoslavya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+msgid "Zambia"
+msgstr "Zambia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Gerçekten bu bağlantıyı\n"
+"silmek istiyor musunuz?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+msgid "Delete Contact?"
+msgstr "Bağlantıyı Sil?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:826
+msgid "Category editor not available."
+msgstr "Kategori düzenleyici bulunamadı."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:833
+msgid "This contact belongs to these categories:"
+msgstr "Bu bağlantı adı aşağıdaki sınıflandırmalara girer:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+msgid "Save Contact as VCard"
+msgstr "Bağlantıyı VCard olarak kaydet"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Bir alan için parçacık bulunamadı: `%s'"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+msgid "Contact Quick-Add"
+msgstr "Bağlantıyı Hızlı Ekle"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+msgid "Edit Full"
+msgstr "Tümünü Düzenle"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: addressbook/gui/widgets/e-addressbook-view.c:357
+msgid "Full Name"
+msgstr "Tam İsim"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+msgid "E-mail"
+msgstr "E-posta"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr "kart.vcf"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+msgid "list"
+msgstr "liste"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s dosyası mevcut\n"
+"Üzerine yazmak istiyor musunuz?"
+
+#: 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 "Dosya üzerine yazılsın mı?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "_2. Adres:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Adresi Denetle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "Ü_lke:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "_Address:"
+msgstr "_Adres:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_City:"
+msgstr "Ş_ehir:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_PO Box:"
+msgstr "_Posta Kutusu:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_State/Province:"
+msgstr "_Bölge:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_ZIP Code:"
+msgstr "Posta _Numarası:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+msgid "Check Full Name"
+msgstr "Tam İsmi Kontrol Et"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr "Dr."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr "Esq."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr "I"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr "II"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr "III"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr "Jr."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr "Miss"
 
+#: addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr "Bay"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr "Bn."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr "Bn."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr "Sr."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr "_Birinci:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_Soyadı:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr "_Ortanca:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
+msgstr "S_onek:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "_Sıfatı:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "List _name:"
+msgstr "_Liste adı:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
+msgstr "Üyeler"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
+msgid "_Remove"
+msgstr "_Sil"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
+msgstr "bağlantı-listesi-editörü"
+
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+msgid "Contact List Editor"
+msgstr "Bağlantı Listesi Düzenleyici"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+msgid "Save List as VCard"
+msgstr "Listeyi VCard Olarak Kaydet"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr "Ekle Gitsin"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid "Duplicate Contact Detected"
+msgstr "Çift Bağlantı Bulundu"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+msgid "New Contact:"
+msgstr "Yeni Bağlantı:"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+msgid "Original Contact:"
+msgstr "Asıl Bağlantı:"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Bağlantı adresinin adı ya da e-posta adresi zaten var.\n"
+"Yine de eklemek istiyor musunuz?"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Change Anyway"
+msgstr "Yine de Değiştir"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Changed Contact:"
+msgstr "Değiştirilen Bağlantı:"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Conflicting Contact:"
+msgstr "Çakışan Bağlantı:"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Değiştirilen bağlantı adresinin adı ya da e-posta adresi zaten var.\n"
+"Yine de eklemek istiyor musunuz?"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:153
+msgid "Advanced Search"
+msgstr "Gelişmiş Arama"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
+msgid "Search"
+msgstr "Ara"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:142
+msgid "No cards"
+msgstr "Kart yok"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:145
+msgid "1 card"
+msgstr "1 kart"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, c-format
 msgid "%d cards"
 msgstr "%d kart"
 
-msgid "%d days"
-msgstr "%d gün"
+#: addressbook/gui/widgets/e-addressbook-model.c:404
+#, fuzzy
+msgid "Error getting book view"
+msgstr "%s başlatırken hata oluştu"
 
-msgid "%d hidden"
-msgstr "%d gizli"
+#: 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"
+msgstr "Kartlar düzenlenirken bir hata oluştu"
 
-msgid "%d hours"
-msgstr "%d saat"
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1141
+msgid "Success"
+msgstr "Başarıldı"
 
-msgid "%d minutes"
-msgstr "%d dakika"
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: 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 "Bilinmeyen hata"
 
-msgid "%d new"
-msgstr "%d yeni"
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+msgid "Repository offline"
+msgstr "Depo çevrimdışı"
 
-msgid "%d seconds"
-msgstr "%d saniye"
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: shell/evolution-shell-component.c:1171
+msgid "Permission denied"
+msgstr "İzin yok"
 
-msgid "%d selected"
-msgstr "%d seçili"
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card not found"
+msgstr "Kart bulunamadı"
 
-msgid "%d sent"
-msgstr "%d gönderilmiş"
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Card ID already exists"
+msgstr "Bu kart numarası var"
 
-msgid "%d total"
-msgstr "toplam %d"
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+msgid "Protocol not supported"
+msgstr "Protokol desteklenmiyor"
 
-msgid "%d unsent"
-msgstr "%d gönderilmemiş"
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: 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:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
+msgid "Cancelled"
+msgstr "İptal Edildi"
 
-msgid "%d weeks"
-msgstr "%d hafta"
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+msgid "Authentication Failed"
+msgstr "Kimlik Denetimi Başarısız."
 
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+msgid "Authentication Required"
+msgstr "Kimlik Denetimi İsteniyor"
 
-msgid "%m/%d/%Y %H"
-msgstr "%d/%m/%Y %H"
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
 
-msgid "%m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y %H:%M"
+#: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "%s dosyası bulunamadı."
 
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%d/%m/%Y %H:%M:%S"
+#: addressbook/gui/widgets/e-addressbook-util.c:47
+msgid "Other error"
+msgstr "Diğer hata"
 
-msgid "%m/%d/%Y %I %p"
-msgstr "%d/%m/%Y %I %p"
+#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
 
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%d/%m/%Y %I:%M %p"
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+msgid "Error adding list"
+msgstr "Liste eklenirken hata oluştu"
 
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%d/%m/%Y %I:%M:%S %p"
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
+msgid "Error adding card"
+msgstr "Kart eklenirken hata oluştu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:91
+msgid "Error modifying list"
+msgstr "Liste düzenlenirken hata oluştu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+msgid "Error removing list"
+msgstr "Listeyi silerken bir hata oluştu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
+msgid "Error removing card"
+msgstr "Kartı silerken bir hata oluştu"
 
+#: addressbook/gui/widgets/e-addressbook-util.c:208
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Görüntüleme"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, fuzzy
+msgid "Display Cards"
+msgstr "Görüntüleme"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:213
+#, c-format
 msgid ""
+"Opening %d cards will open %d new windows as well.\n"
+"Do you really want to display all of these cards?"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:348
+#, fuzzy
+msgid "Move card to"
+msgstr "Monte Scuro"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:350
+#, fuzzy
+msgid "Copy card to"
+msgstr "Kart yok"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:353
+#, fuzzy
+msgid "Move cards to"
+msgstr "Kart yok"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:355
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Kart yok"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:355
+msgid "* Click here to add a contact *"
+msgstr "* Bağlantı eklemek buraya tıklayın *"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:359
+msgid "Primary Phone"
+msgstr "İlk Telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:360
+msgid "Assistant Phone"
+msgstr "Sekreter Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:361
+msgid "Business Phone"
+msgstr "İş Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:362
+msgid "Callback Phone"
+msgstr "Geri Arama Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:363
+msgid "Company Phone"
+msgstr "Şirket Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:364
+msgid "Home Phone"
+msgstr "Ev Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:366
+msgid "Business Address"
+msgstr "İşyeri Adresi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:367
+msgid "Home Address"
+msgstr "Ev Adresi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:368
+msgid "Mobile Phone"
+msgstr "Cep Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:369
+msgid "Car Phone"
+msgstr "Araç Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:372
+msgid "Business Phone 2"
+msgstr "2. İş Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:373
+msgid "Home Phone 2"
+msgstr "2. Ev Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:375
+msgid "Other Phone"
+msgstr "Diğer Telefonlar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:381
+msgid "Other Address"
+msgstr "Diğer Adres"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:461
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adres Defteri"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard"
+msgstr "VCard olarak kaydet"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "New Contact..."
+msgstr "Yeni Bağlantı"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Yeni Bağlantı Listesi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Dizine _Git..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+#, fuzzy
+msgid "Import..."
+msgstr "_Al..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "Bağ_lantıları Ara"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:906
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Adres Defteri Kaynakları..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:908
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot Ayarları..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Bağlantıyı Gönder"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+msgid "Send Message to Contact"
+msgstr "Bağlantıya İleti Gönder"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/my-evolution.xml.h:1
+msgid "Print"
+msgstr "Yazdır"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:916
+msgid "Print Envelope"
+msgstr "Zarfı Yazdır"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:920
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "D_izine Kopyala..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:921
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_Dizine Taşı..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Kes"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopyala"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "Yapıştır"
+
+#: addressbook/gui/widgets/e-addressbook-view.c: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
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "Sil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#, fuzzy
+msgid "Current View"
+msgstr "Ş_imdiki Görünüm"
+
+#. Minicard view stuff
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c: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"
+
+#. Translators: put here a list of characters that correspond to buttons
+#. 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: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:1374
+#, c-format
+msgid ""
+"The addressbook backend for\n"
 "%s\n"
+"has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr "ve %d adet diğer kart."
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr "ve diğer 1 kart."
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
+msgid "Save in addressbook"
+msgstr "Adres Defterine kaydet"
+
+#: addressbook/gui/widgets/e-minicard-view.c:140
+msgid ""
 "\n"
-"The error from the activation system is:\n"
-"%s"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
 msgstr ""
-"%s\n"
 "\n"
-"Etkinleştirme sisteminden gelen mesaj:\n"
-"%s"
+"\n"
+"Bu bakışta gösterilecek öğe yok\n"
+"\n"
+"Buraya çift tıklayarak bir bağlantı yaratın."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
-"%s\n"
 "\n"
-"The error from the component system is:\n"
-"%s"
+"\n"
+"There are no items to show in this view."
 msgstr ""
-"%s\n"
 "\n"
-"Bileşen sisteminden gelen hata:\n"
-"%s"
+"\n"
+"Bu bakışta gösterilecek öğe yok"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+msgid "Card View"
+msgstr "Kart Görünümü"
+
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "Zarfı yazdır"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "Kartları yazdır"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "Kartı yazdır"
+
+#: addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr "10 bn. Tahoma"
+
+#: addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr "8 bn. Tahoma"
+
+#: addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
+msgstr "Sonda boş formlar:"
+
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr "Gövde"
+
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr "Alt:"
+
+#: addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr "Boyutlar:"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+msgid "F_ont..."
+msgstr "_Yazıtipi..."
+
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "Yazıtipleri"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
+msgstr "Altbilgi:"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "Biçim"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+msgid "Header"
+msgstr "Üstbilgi"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr "Üstbilgi/Altbilgi"
+
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr "Başlıklar"
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr "Her mektup için başlıklar"
+
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Yükseklik:"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr "Birbirini ardışık takip et"
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr "İçer:"
+
+#: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:634
+msgid "Landscape"
+msgstr "Yatay"
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr "Sol:"
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr "Kenarda harf sekmeleri"
+
+#: addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr "Marjin"
+
+#: addressbook/printing/e-contact-print.glade.h:22
+msgid "Number of columns:"
+msgstr "Sütun sayısı:"
+
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+msgid "Options"
+msgstr "Seçenekler"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:621
+msgid "Orientation"
+msgstr "Konum"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1671
+msgid "Page"
+msgstr "Sayfa"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr "Sayfa Ayarları:"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr "Kağıt"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr "Kağıt kaynağı:"
+
+#. Portrait
+#: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:627
+msgid "Portrait"
+msgstr "Portre"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "Önizleme:"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr "Gri tonlama kullanarak yazdır"
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr "Çift sayfalarda ters çevir"
+
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr "Sağ:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr "Bölümler:"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr "Tonlama"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+msgid "Size:"
+msgstr "Boyut:"
 
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr "Yeni bir sayfada başla"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr "Stil adı:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr "Tepe:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Type:"
+msgstr "Tip:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "Genişlik:"
+
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr "_Yazıtipi..."
+
+#: calendar/cal-util/cal-component.c:1218
+msgid "Untitled appointment"
+msgstr "Başlıksız toplantı"
+
+#: 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:748
+msgid "High"
+msgstr "Yüksek"
+
+#: 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: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:746
+msgid "Low"
+msgstr "Düşük"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:520
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/e-calendar-table.c:421
+msgid "Undefined"
+msgstr "Tanımsız"
+
+#: 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 "Takvim sunucusuyla iletişimde hata oluştu"
+
+#: 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'tan takvim uygulama bloğu okunamadı"
+
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "Ö_ncelik:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
+msgid "Could not read pilot's ToDo application block"
+msgstr "Pilot ToDO uygulama bloğu okunamadı"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A Bonobo control which displays a task list."
+msgstr "Görev listesi gösteren örnek bir Bonobo denetleyici."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Takvim gösteren örnek bir Bonobo denetleyici."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Takvim ve Görev Ayarları"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Evolution e-posta programı mimarisi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution takvimi iTip/iMip görüntüleyici"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Evolution component for handling the calendar."
+msgstr "Takvimi düzenleyen Evolution bileşeni."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Evolution e-posta programı mimarisi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the calendar iTip view control"
+msgstr "Takvim iTip görüntü kontrolü mimarisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+msgid "Factory for the sample Calendar control"
+msgstr "Örnek Takvim kontrolü mimarisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Örnek Takvim kontrolü mimarisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#, fuzzy
+msgid "Factory to create a component editor factory"
+msgstr "Bileşen düzenleyici mimarisi oluşturulamadı."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "Alarm bilgilendirme servisi"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "Alarm bilgilendirme servisi mimarisi"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Başlangıç:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Bitiş:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+msgid "invalid time"
+msgstr "geçersiz saat"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+msgid "Evolution Alarm"
+msgstr "Evolution Alarmı"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, c-format
+msgid "Alarm on %s"
+msgstr "%s tarihinde Alarm"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Kapat"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Snoo_ze"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Dinlenme zamanı (dakika)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+msgid "_Edit appointment"
+msgstr "_Toplantıyı düzenle"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:680
+msgid "No description available."
+msgstr "Açıklama yok."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
-"%s\n"
-"\n"
-"Unknown error."
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
 msgstr ""
-"%s\n"
+
+#: 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 "Uyarı"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:764
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
-"Bilinmeyen hata."
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
 
-msgid "%s (%d%% complete)"
-msgstr "%s (%%%d tamamlandı)"
+#: calendar/gui/alarm-notify/alarm-queue.c:778
+#, fuzzy
+msgid "Do not ask me about this program again."
+msgstr "Tekrar sorma."
 
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
+msgid "Could not initialize GNOME"
+msgstr "GNOME başlatılamıyor"
 
-msgid "%s (...)"
-msgstr "%s (...)"
+#: calendar/gui/alarm-notify/notify-main.c:184
+msgid "Could not create the alarm notify service factory"
+msgstr "Alarm bilgilendirme servis mimarisi oluşturamadım"
 
-msgid "%s - Message"
-msgstr "%s - İleti"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Özet içeriği"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Açıklama içeriği"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Yorum içeriği"
+
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+msgid "Unmatched"
+msgstr "Eşleme yok"
+
+#: calendar/gui/calendar-commands.c:405
+msgid "%A %d %B %Y"
+msgstr "%d %B %A %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+msgid "%a %d %b"
+msgstr "%d %b %a"
 
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
+msgstr "%d %b %a %Y"
+
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/calendar-commands.c:799
 msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
+
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/e-calendar-table.c:397
+msgid "Private"
+msgstr "Özel"
+
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/e-calendar-table.c:398
+msgid "Confidential"
+msgstr "Gizli"
+
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+msgid "Public"
+msgstr "Genel"
+
+#: calendar/gui/calendar-model.c:536
+msgid "N"
+msgstr "K"
+
+#: calendar/gui/calendar-model.c:536
+msgid "S"
+msgstr "G"
+
+#: calendar/gui/calendar-model.c:538
+msgid "E"
+msgstr "D"
+
+#: calendar/gui/calendar-model.c:538
+msgid "W"
+msgstr "B"
+
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
+msgid "Free"
+msgstr "Boş"
+
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1165
+msgid "Busy"
+msgstr "Meşgul"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
+msgid "Not Started"
+msgstr "Başlamadı"
+
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
+msgid "In Progress"
+msgstr "İşlemde"
+
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
+msgid "Completed"
+msgstr "Tamamlandı"
+
+#: calendar/gui/calendar-model.c:1049
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
-"%s dosyası mevcut\n"
-"Üzerine yazmak istiyor musunuz?"
+"Coğrafi konum aşağıdaki biçimde girilmelidir:\n"
+"\n"
+"45.436845,125.862501"
 
-msgid "%s attachment"
-msgstr "%s ek"
+#. 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: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
+#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
+msgid "None"
+msgstr "Yok"
 
-msgid "%s mailing list"
-msgstr "%s posta listesi"
+#: calendar/gui/calendar-model.c:1717
+msgid "Recurring"
+msgstr "Tekrarlama"
 
-msgid "%s server %s"
-msgstr "%s sunucu %s"
+#: calendar/gui/calendar-model.c:1719
+msgid "Assigned"
+msgstr "Görevlendirildi"
 
-msgid "%s: Inbox"
-msgstr "%s: Gelen"
+#: 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:568
+#: calendar/gui/e-meeting-model.c:862
+msgid "Yes"
+msgstr "Evet"
 
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sLütfen %s@%s için IMAP parolasını giriniz"
+#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:863
+msgid "No"
+msgstr "Hayır"
 
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sLütfen %s@%s için POP3 parolasını girin"
+#: calendar/gui/calendar-view-factory.c:148
+msgid "Day View"
+msgstr "Gün Görünümü"
 
-msgid "%sPlease enter the SMTP password for %s@%s"
-msgstr "%sLütfen %s@%s için SMTP parolasını giriniz"
+#: calendar/gui/calendar-view-factory.c:151
+msgid "Work Week View"
+msgstr "Çalışma Haftası Görünümü"
 
-msgid "%u bytes"
-msgstr "%u bayt"
+#: calendar/gui/calendar-view-factory.c:154
+msgid "Week View"
+msgstr "Hafta Görünümü"
 
-msgid "%x"
-msgstr "%x"
+#: calendar/gui/calendar-view-factory.c:157
+msgid "Month View"
+msgstr "Ay Görünümü"
 
-msgid "(%d not shown)"
-msgstr "(%d adet gösterilmiyor)"
+#: 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 "Takvim"
 
-msgid "(No Description)"
-msgstr "(Açıklama Yok)"
+#: calendar/gui/component-factory.c:72
+msgid "Folder containing appointments and events"
+msgstr "Randevuları tutan dizin"
 
-msgid "(No folder displayed)"
-msgstr "(dizin gösterilmiyor)"
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "_Genel Takvim URL:"
 
-msgid "(No name)"
-msgstr "(simsiz)"
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Randevuları tutan dizin"
 
-msgid "(No subject)"
-msgstr "(Konusuz)"
+#: 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 "Görevler"
 
-msgid "(None)"
-msgstr "(Hiçbiri)"
+#: calendar/gui/component-factory.c:82
+msgid "Folder containing to-do items"
+msgstr "Yapılacaklar listesini tutan dizin"
 
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Genel"
 
-msgid "(Unknown error)"
-msgstr "(Bilinmeyen hata)"
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Yapılacaklar listesini tutan dizin"
 
-msgid "(Unknown)"
-msgstr "(Bilinmiyor)"
+#: calendar/gui/component-factory.c:735
+#, fuzzy
+msgid "New appointment"
+msgstr "Yeni Randevu"
 
-msgid "(Untitled Message)"
-msgstr "(Başlıksız İleti)"
+#: calendar/gui/component-factory.c:735
+#, fuzzy
+msgid "_Appointment"
+msgstr "Randevu"
 
-msgid "(Untitled)"
-msgstr "(isimsiz)"
+#: calendar/gui/component-factory.c:736
+msgid "Create a new appointment"
+msgstr "Yeni bir randevu oluştur"
 
-msgid "(match-all) requires a single bool result"
-msgstr "(hepsini-eşle) boolean sonuç içermelidir"
+#: calendar/gui/component-factory.c:740
+#, fuzzy
+msgid "New meeting"
+msgstr "Haber Grubu Ayarları"
 
-msgid "(none)"
-msgstr "(hiçbiri)"
+#: calendar/gui/component-factory.c:740
+#, fuzzy
+msgid "_Meeting"
+msgstr "Toplantı"
 
-msgid "(unknown host)"
-msgstr "(Bilinmeyen makine)"
+#: calendar/gui/component-factory.c:741
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Yeni bir görev oluştur"
 
-msgid "* Click here to add a contact *"
-msgstr "* Bağlantı eklemek buraya tıklayın *"
+#: calendar/gui/component-factory.c:745
+#, fuzzy
+msgid "New task"
+msgstr "Yeni Görev"
 
-msgid ", "
-msgstr ", "
+#: calendar/gui/component-factory.c:745
+msgid "_Task"
+msgstr "_Görev"
 
-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"
+#: calendar/gui/component-factory.c:746
+msgid "Create a new task"
+msgstr "Yeni bir görev oluştur"
 
-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"
+#: calendar/gui/component-factory.c:750
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Yeni Randevu"
 
-msgid "--to--"
-msgstr "--kime--"
+#: calendar/gui/component-factory.c:750
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Yeni _Randevu"
 
-msgid "..."
-msgstr "..."
+#: calendar/gui/component-factory.c:751
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Yeni bir randevu oluştur"
 
-msgid "0%"
-msgstr "%0"
+#: calendar/gui/control-factory.c:123
+#, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "`%s' dizini açılamadı."
 
-msgid "05 minutes"
-msgstr "5 dakika"
+#: calendar/gui/control-factory.c:167
+msgid "The URI that the calendar will display"
+msgstr "Takvimin gösterecek olduğu URI"
 
-msgid "1 byte"
-msgstr "1 bayt"
+#: calendar/gui/control-factory.c:174
+msgid "The type of view to show"
+msgstr ""
 
-msgid "1 card"
-msgstr "1 kart"
+#: calendar/gui/dialogs/alarm-options.c:359
+msgid "Audio Alarm Options"
+msgstr "Ses Alarm Seçenekleri"
+
+#: calendar/gui/dialogs/alarm-options.c:368
+msgid "Message Alarm Options"
+msgstr "İleti Alarm Seçenekleri"
+
+#: calendar/gui/dialogs/alarm-options.c:377
+msgid "Mail Alarm Options"
+msgstr "E-posta Alarmı Seçenekleri"
+
+#: calendar/gui/dialogs/alarm-options.c:386
+msgid "Program Alarm Options"
+msgstr "Program Alarm Seçenekleri"
+
+#: calendar/gui/dialogs/alarm-options.c:395
+msgid "Unknown Alarm Options"
+msgstr "Bilinmeyen Alarm Seçenekleri"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr "Alarm Tekrarı"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid ""
+"Evolution does not yet support email notification for reminders.  You will "
+"not be able to edit the options for this reminder."
+msgstr ""
 
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
+msgstr "Gösterilecek İleti"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
+msgstr "Ses çal:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr "Alarmı tekrar et"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
+msgstr "Program çalıştır:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr "Bu argümanlarla:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
+msgid "days"
+msgstr "gün"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
+msgid "hours"
+msgstr "saat"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
+msgid "minutes"
+msgstr "dakika"
+
+#: calendar/gui/dialogs/alarm-page.c:319
+#, c-format
+msgid "%d days"
+msgstr "%d gün"
+
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 gün"
 
+#: calendar/gui/dialogs/alarm-page.c:327
+#, c-format
+msgid "%d weeks"
+msgstr "%d hafta"
+
+#: calendar/gui/dialogs/alarm-page.c:330
+msgid "1 week"
+msgstr "1 hafta"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#, c-format
+msgid "%d hours"
+msgstr "%d saat"
+
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 saat"
 
+#: calendar/gui/dialogs/alarm-page.c:343
+#, c-format
+msgid "%d minutes"
+msgstr "%d dakika"
+
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 dakika"
 
+#: calendar/gui/dialogs/alarm-page.c:351
+#, c-format
+msgid "%d seconds"
+msgstr "%d saniye"
+
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 saniye"
 
-msgid "1 week"
-msgstr "1 hafta"
+#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Bir ses çal"
 
-msgid "10 minutes"
-msgstr "10 dakika"
+#: calendar/gui/dialogs/alarm-page.c:387
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+msgid "Display a message"
+msgstr "Bir mesaj göster"
 
-msgid "10 pt. Tahoma"
-msgstr "10 bn. Tahoma"
+#: calendar/gui/dialogs/alarm-page.c:391
+msgid "Send an email"
+msgstr "Bir e-posta gönder"
 
-msgid "10%"
-msgstr "%10"
+#: calendar/gui/dialogs/alarm-page.c:395
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Bir program çalıştır"
 
-msgid "100%"
-msgstr "%100"
+#: calendar/gui/dialogs/alarm-page.c:401
+msgid "Unknown action to be performed"
+msgstr "Bilinmeyen eylem"
 
-msgid "10th"
-msgstr "10."
+#: calendar/gui/dialogs/alarm-page.c:413
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "randevu başlangıcı"
 
-msgid "11th"
-msgstr "11."
+#: calendar/gui/dialogs/alarm-page.c:416
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "randevu başlangıcı"
 
-msgid "12th"
-msgstr "12."
+#: calendar/gui/dialogs/alarm-page.c:421
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "randevu başlangıcı"
 
-msgid "13th"
-msgstr "13."
+#: calendar/gui/dialogs/alarm-page.c:430
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "Randevuyu sil"
 
-msgid "14th"
-msgstr "14."
+#: calendar/gui/dialogs/alarm-page.c:433
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "randevu başlangıcı"
 
+#: calendar/gui/dialogs/alarm-page.c:438
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "randevu sonu"
+
+#: calendar/gui/dialogs/alarm-page.c:462
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s sunucu %s"
+
+#: calendar/gui/dialogs/alarm-page.c:468
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Basics"
+msgstr "Temel"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "Date/Time:"
+msgstr "Tarih/Zaman:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+msgid "Reminders"
+msgstr "Hatırlatıcılar"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Özet:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+msgid "_Options..."
+msgstr "_Seçenekler..."
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+msgid "after"
+msgstr "sonra"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:12
+msgid "before"
+msgstr "önce"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "gün"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+msgid "end of appointment"
+msgstr "randevu sonu"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "hour(s)"
+msgstr "saat"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+msgid "minute(s)"
+msgstr "dakika"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17
+msgid "start of appointment"
+msgstr "randevu başlangıcı"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "05 minutes"
+msgstr "5 dakika"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid "10 minutes"
+msgstr "10 dakika"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "15 minutes"
 msgstr "15 dakika"
 
-msgid "15th"
-msgstr "15."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+msgid "30 minutes"
+msgstr "30 dakika"
 
-msgid "16th"
-msgstr "16."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "60 minutes"
+msgstr "60 dakika"
 
-msgid "17th"
-msgstr "17."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
 
-msgid "18th"
-msgstr "18."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Calendar and Tasks Settings"
+msgstr "Takvim ve Görev Ayarları"
 
-msgid "19th"
-msgstr "19."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Color for overdue tasks"
+msgstr "Tamamlanamayan görevlerin rengi"
 
-msgid "1st"
-msgstr "1."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Color for tasks due today"
+msgstr "Bugün tamamlanması gereken görevlerin rengi"
 
-msgid "20%"
-msgstr "%20"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
 
-msgid "20th"
-msgstr "20."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Days"
+msgstr "Gün"
 
-msgid "21st"
-msgstr "21."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.c:1127
+msgid "Friday"
+msgstr "Cuma"
 
-msgid "22nd"
-msgstr "22."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Hours"
+msgstr "Saat"
 
-msgid "23rd"
-msgstr "23."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Minutes"
+msgstr "Dakika"
 
-msgid "24th"
-msgstr "24."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.c:1123
+msgid "Monday"
+msgstr "Pazartesi"
 
-msgid "25th"
-msgstr "25."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_Paz"
 
-msgid "26th"
-msgstr "26."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.c:1128
+msgid "Saturday"
+msgstr "Cumartesi"
 
-msgid "27th"
-msgstr "27."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
+msgstr ""
 
-msgid "28th"
-msgstr "28."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Show week _numbers in date navigator"
+msgstr ""
 
-msgid "29th"
-msgstr "29."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.c:1129
+msgid "Sunday"
+msgstr "Pazar"
 
-msgid "2nd"
-msgstr "2."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "_Bugünün işleri:"
 
-msgid "30 minutes"
-msgstr "30 dakika"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "T_hu"
+msgstr "P_er"
 
-msgid "30%"
-msgstr "%30"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Görev Listesi"
 
-msgid "30th"
-msgstr "39."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1126
+msgid "Thursday"
+msgstr "Perşembe"
 
-msgid "31st"
-msgstr "31."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Time"
+msgstr "Zaman"
 
-msgid "389"
-msgstr "389"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Time _zone:"
+msgstr "Zaman _dilimi:"
 
-msgid "3rd"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Time format:"
+msgstr "Zaman biçimi:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1124
+msgid "Tuesday"
+msgstr "Salı"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:1125
+msgid "Wednesday"
+msgstr "Çarşamba"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ui/evolution-calendar.xml.h:24
+msgid "Work Week"
+msgstr "Çalışma Haftası"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "_12 hour (AM/PM)"
+msgstr "_12 saat (ÖÖ/ÖS)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "_24 hour"
+msgstr "_24 saat"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "_Ask for confirmation when deleting items"
+msgstr "Öğ_eleri silmeden önce sor"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "_Compress weekends in month view"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Görev başlangıcı: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "_Display"
+msgstr "_Göster"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "_Fri"
+msgstr "_Cum"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:158
+msgid "_General"
+msgstr "_Genel"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "_Silenen İletileri Gizle"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "_Mon"
+msgstr "P_zt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "_Zamanı geçen görevler:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+msgid "_Sat"
+msgstr "_Cmt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+msgid "_Show appointment end times in week and month views"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "_Zaman bölümleri:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Sal"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "_Wed"
+msgstr "Ç_ar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
+msgstr "Randevuyu sil"
+
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:59
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Gerçekten %d görevi silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/changed-comp.c:59
+msgid "This event has been deleted."
+msgstr "Olay silindi."
+
+#: calendar/gui/dialogs/changed-comp.c:63
+msgid "This task has been deleted."
+msgstr "Bu görev silindi."
+
+#: calendar/gui/dialogs/changed-comp.c:67
+#, fuzzy
+msgid "This journal entry has been deleted."
+msgstr "Olay silindi."
+
+#: calendar/gui/dialogs/changed-comp.c:76
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:78
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:83
+#, fuzzy
+msgid "This event has been changed."
+msgstr "Görev değiştirildi."
+
+#: calendar/gui/dialogs/changed-comp.c:87
+msgid "This task has been changed."
+msgstr "Görev değiştirildi."
+
+#: calendar/gui/dialogs/changed-comp.c:91
+#, fuzzy
+msgid "This journal entry has been changed."
+msgstr "Görev değiştirildi."
+
+#: calendar/gui/dialogs/changed-comp.c:100
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:102
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+msgid " (Completed "
+msgstr " (Tamamlanan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+msgid "Completed "
+msgstr "Tamamlanan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#, fuzzy
+msgid " (Due "
+msgstr "Tarihe göre "
+
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+msgid "Due "
+msgstr "Tarihe göre "
+
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Nesne güncellenemedi"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Nesne güncellenemedi"
+
+#: calendar/gui/dialogs/comp-editor.c:797
+msgid "Edit Appointment"
+msgstr "Randevuyu Düzenle"
+
+#: calendar/gui/dialogs/comp-editor.c:802
+#, c-format
+msgid "Appointment - %s"
+msgstr "Randevu - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:805
+#, c-format
+msgid "Task - %s"
+msgstr "Görev - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:808
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:822
+msgid "No summary"
+msgstr "Özet yok"
+
+#: calendar/gui/dialogs/comp-editor.c:1220
+#: 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 "Farklı kaydet..."
+
+#: calendar/gui/dialogs/comp-editor.c:1321
+#: calendar/gui/dialogs/comp-editor.c:1345
+#: calendar/gui/dialogs/comp-editor.c:1369
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1396
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:96
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "Gerçekten '%s' randevusunu silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/delete-comp.c:99
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr "Gerçekten bu randevuyu silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/delete-comp.c:105
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "Gerçekten %s görevini silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/delete-comp.c:108
+msgid "Are you sure you want to delete this untitled task?"
+msgstr "Gerçekten bu görevi silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/delete-comp.c:114
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/delete-comp.c:117
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr "Bu başlıksız günlük girdisini silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/delete-comp.c:132
+#, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Gerçekten %d randevuyu silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/delete-comp.c:137
+#, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Gerçekten %d görevi silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/delete-comp.c:142
+#, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Gerçekten %d günlük girdisini silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+msgid "Addressbook..."
+msgstr "Adres Defteri..."
+
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+msgid "Delegate To:"
+msgstr "Dağıt:"
+
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#, fuzzy
+msgid "Enter Delegate"
+msgstr "Bitiş Tarihi"
+
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+msgid "Appointment"
+msgstr "Randevu"
+
+#: calendar/gui/dialogs/event-editor.c:222
+msgid "Reminder"
+msgstr "Hatırlatıcı"
+
+#: calendar/gui/dialogs/event-editor.c:227
+msgid "Recurrence"
+msgstr "Tekrarlama"
+
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
+msgid "Scheduling"
+msgstr "Zaman Düzenleme"
+
+#: calendar/gui/dialogs/event-editor.c:237
+#: calendar/gui/dialogs/event-editor.c:302
+#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+msgid "Meeting"
+msgstr "Toplantı"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "_Tüm gün olayları"
+
+#: calendar/gui/dialogs/event-page.glade.h:2
+msgid "B_usy"
+msgstr "Meşgu_l"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "Sınıflandırma"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Con_fidential"
+msgstr "_Gizli"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Date & Time"
+msgstr "Tarih & Zaman"
+
+#: calendar/gui/dialogs/event-page.glade.h:7
+msgid "F_ree"
+msgstr "_Boş"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+msgid "L_ocation:"
+msgstr "_Konum: "
+
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
+msgid "Pri_vate"
+msgstr "Ö_zel"
+
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:7
+msgid "Pu_blic"
+msgstr "_Genel"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+msgid "Show Time As"
+msgstr "Zamanı Farklı Göster"
+
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "Su_mmary:"
+msgstr "Ö_zet:"
+
+#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Bağlantılar..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
+msgid "_End time:"
+msgstr "B_itiş tarihi:"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+msgid "_Start time:"
+msgstr "B_aşlangıç tarihi:"
+
+#: calendar/gui/dialogs/meeting-page.c:414
+#, fuzzy
+msgid "An organizer is required."
+msgstr "Bir düzenleyen kişi olmak zorunda."
+
+#: calendar/gui/dialogs/meeting-page.c:438
+msgid "At least one attendee is required."
+msgstr "En az bir katılan olmalıdır."
+
+#: calendar/gui/dialogs/meeting-page.c:594
+msgid "That person is already attending the meeting!"
+msgstr "Bu kişi toplantıya zaten katılıyor!"
+
+#: calendar/gui/dialogs/meeting-page.c:669
+msgid "_Delegate To..."
+msgstr "_Dağıt..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Katılımcı"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Katılımcı eklemek için tıklayın"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Ortak İsim"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#, fuzzy
+msgid "Delegated From"
+msgstr "Dağıt:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#, fuzzy
+msgid "Delegated To"
+msgstr "Dağıt:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Dil"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Üye"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Görev"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Durum"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tür"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizatör:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
+msgstr "O_rganizatörü Değiştir"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/e-meeting-time-sel.c:456
+msgid "_Invite Others..."
+msgstr "_Başkalarını Davet Et..."
+
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
+#, fuzzy
+msgid "st"
+msgstr "1."
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2."
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
 msgstr "3."
 
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
+#: calendar/gui/dialogs/recurrence-page.c:135
+#: calendar/gui/dialogs/recurrence-page.c:136
+#: calendar/gui/dialogs/recurrence-page.c:137
+#: calendar/gui/dialogs/recurrence-page.c:138
+#: calendar/gui/dialogs/recurrence-page.c:139
+#: calendar/gui/dialogs/recurrence-page.c:140
+#: calendar/gui/dialogs/recurrence-page.c:141
+#: calendar/gui/dialogs/recurrence-page.c:142
+#: calendar/gui/dialogs/recurrence-page.c:143
+#: calendar/gui/dialogs/recurrence-page.c:144
+#: calendar/gui/dialogs/recurrence-page.c:145
+#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:150
+#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:155
+msgid "th"
+msgstr "."
+
+#: calendar/gui/dialogs/recurrence-page.c:629
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Bu randevuyu Evolution düzenleyemiyor."
+
+#: calendar/gui/dialogs/recurrence-page.c:999
+msgid "on"
+msgstr "tarih"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "first"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+msgid "second"
+msgstr "ikinci"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "third"
+msgstr "Diğer"
+
+#: calendar/gui/dialogs/recurrence-page.c:1067
+#, fuzzy
+msgid "fourth"
+msgstr "Kuzey"
+
+#: calendar/gui/dialogs/recurrence-page.c:1068
+#, fuzzy
+msgid "last"
+msgstr "Doğu"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+#, fuzzy
+msgid "Other Date"
+msgstr "Başka Fakslar"
+
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+msgid "day"
+msgstr "gün"
+
+#: calendar/gui/dialogs/recurrence-page.c:1262
+msgid "on the"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1447
+msgid "occurrences"
+msgstr "tekrarlar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
+msgstr "_Ekle"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Her"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "İstisnalar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Preview"
+msgstr "Önizleme"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Recurrence Rule"
+msgstr "Tekrarlama Kuralı"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "_Custom recurrence"
+msgstr "_Özel tekrar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+msgid "_Modify"
+msgstr "_Düzenle"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "_No recurrence"
+msgstr "_Tekrarlama yok"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Simple recurrence"
+msgstr "_Basit tekrar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "için"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "daima"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "ay"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "tarihe kadar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "hafta"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "yıl"
+
+#: calendar/gui/dialogs/send-comp.c:56
+#, fuzzy
+msgid "The meeting information has been created. Send it?"
+msgstr "Toplantı bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
+
+#: calendar/gui/dialogs/send-comp.c:59
+msgid "The meeting information has changed. Send an updated version?"
+msgstr "Toplantı bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
+
+#: calendar/gui/dialogs/send-comp.c:66
+#, fuzzy
+msgid "The task assignment information has been created. Send it?"
+msgstr "Görev bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
+
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
+msgstr "Görev bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "Biten %"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
+msgstr "Tamamlama Tarihi:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
+msgid "Needs Action"
+msgstr "İşlem Gerektiriyor"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+msgid "Progress"
+msgstr "İşlem"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Priority:"
+msgstr "Ö_ncelik:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:16
+msgid "_Status:"
+msgstr "_Durum:"
+
+#: calendar/gui/dialogs/task-editor.c:206
+msgid "Basic"
+msgstr "Temel"
+
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
+#, fuzzy
+msgid "Assignment"
+msgstr "Görevlendirildi"
+
+#: 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:"
+msgstr "Açıklama:"
+
+#: calendar/gui/dialogs/task-page.glade.h:8
+msgid "Sta_rt Date:"
+msgstr "_Başlangıç Tarihi:"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "_Due Date:"
+msgstr "_Tarihe Göre:"
+
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "%0"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "%10"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "%20"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "%30"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
 msgid "40%"
 msgstr "%40"
 
-msgid "4th"
-msgstr "4."
-
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
 msgid "50%"
 msgstr "%50"
 
-msgid "5th"
-msgstr "5."
-
-msgid "60 minutes"
-msgstr "60 dakika"
-
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
 msgid "60%"
 msgstr "%60"
 
-msgid "6th"
-msgstr "6."
-
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
 msgid "70%"
 msgstr "%70"
 
-msgid "7th"
-msgstr "7."
-
-msgid "8 pt. Tahoma"
-msgstr "8 bn. Tahoma"
-
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
 msgid "80%"
 msgstr "%80"
 
-msgid "8th"
-msgstr "8."
-
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
 msgid "90%"
 msgstr "%90"
 
-msgid "9th"
-msgstr "8."
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "%100"
 
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> bir toplantıyı iptal etti."
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1919
+msgid "Deleting selected objects"
+msgstr "Seçilen bağlantılar siliniyor"
 
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> bir görevi iptal etti."
+#: 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ç"
 
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> boş/meşgul bilgisi gönderdi."
+#: calendar/gui/e-calendar-table.c:988
+#, fuzzy
+msgid "_Save as..."
+msgstr "Farklı kaydet..."
+
+#: 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 "_Yazdır..."
+
+#: 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 "_Kes"
+
+#: 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 "_Kopyala"
+
+#: 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"
+msgstr "_Yapıştır"
+
+#: calendar/gui/e-calendar-table.c:999
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Görev Ata"
+
+#: calendar/gui/e-calendar-table.c:1000
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "i_Calendar Olarak Yönlendir"
+
+#: calendar/gui/e-calendar-table.c:1001
+msgid "_Mark as Complete"
+msgstr "_Bitmiş Olarak İşaretle"
+
+#: calendar/gui/e-calendar-table.c:1002
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
+msgstr "Görevleri _Bitmiş Olarak İşaretle"
+
+#: calendar/gui/e-calendar-table.c:1007
+msgid "_Delete Selected Tasks"
+msgstr "_Seçilen Görevleri Sil"
+
+#: 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 "Nesneler güncelleniyor"
+
+#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:6
+msgid "Click to add a task"
+msgstr "Görev eklemek için tıklayın"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Uyarılar"
+
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
+msgid "Complete"
+msgstr "Tamamlandı"
 
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Completion Date"
+msgstr "Tamamlanma Tarihi"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "Due Date"
+msgstr "Tarihe göre:"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "End Date"
+msgstr "Bitiş Tarihi"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Geographical Position"
+msgstr "Coğrafi Konum"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Priority"
+msgstr "Öncelik"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Start Date"
+msgstr "Başlangıç Tarihi"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
+#: shell/e-shortcuts.c:1051
+msgid "Summary"
+msgstr "Özet"
+
+#: calendar/gui/e-calendar-table.etspec.h:17
+msgid "Task sort"
+msgstr "Görev sıralama"
+
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%d/%m/%Y %A %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%d/%m/%Y %A %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Gün, aşağıdaki biçimde girilmelidir: \n"
+"\n"
+"%s"
+
+#: calendar/gui/e-day-view-time-item.c:518
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i dakika bölmeleri"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+msgid "%A %d %B"
+msgstr "%d %B %A"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-week-view-main-item.c:347
+msgid "%d %b"
+msgstr "%d %b"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/print.c:791
+msgid "am"
+msgstr "öö"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/print.c:793
+msgid "pm"
+msgstr "ös"
+
+#: calendar/gui/e-day-view.c:3707
+msgid "New _Appointment"
+msgstr "Yeni _Randevu"
+
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+msgid "New All Day _Event"
+msgstr "Y_eni Tüm Gün Olayı"
+
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#, fuzzy
+msgid "New Meeting"
+msgstr "Toplantı"
+
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+msgid "New Task"
+msgstr "Yeni Görev"
+
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Yazdır..."
+
+#: 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üne Git"
+
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+msgid "_Go to Date..."
+msgstr "_Güne Git..."
+
+#: 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 "_Boş/Meşgul Bilgisini Yayınla"
+
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
+#, fuzzy
+msgid "_Configure..."
+msgstr "Yapılandırma"
+
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#, fuzzy
+msgid "_Configure Pilot..."
+msgstr "Yapılandırma"
+
+#: 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 "_Farklı Kaydet..."
+
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Toplantı Zamanı Düzenle"
+
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "i_Calendar Olarak Yönlendir"
+
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+msgid "Make this Occurrence _Movable"
+msgstr "Bu _Oluşumu Taşınabilir Yap"
+
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+msgid "Delete this _Occurrence"
+msgstr "_Bu Oluşumu Sil"
+
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+msgid "Delete _All Occurrences"
+msgstr "_Tüm Oluşumları Sil"
+
+#: 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 "Bu sistemde GNOME Pilot araçları kurulu değil."
+
+#: 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 çalıştırırken bir hata oldu."
+
+#: calendar/gui/e-itip-control.c:590
+msgid "<b>Starts:</b> "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:600
+#, fuzzy
+msgid "<b>Ends:</b> "
+msgstr "Bitiş: <b>"
+
+#: calendar/gui/e-itip-control.c:613
+#, fuzzy
+msgid "<b>Completed:</b> "
+msgstr "Tamamlanan "
+
+#: calendar/gui/e-itip-control.c:623
+msgid "<b>Due:</b> "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+msgid "iCalendar Information"
+msgstr "iCalendar Bilgisi"
+
+#. Title
+#: calendar/gui/e-itip-control.c:675
+msgid "iCalendar Error"
+msgstr "iCalendar Hatası"
+
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+msgid "An unknown person"
+msgstr "Bilinmeyen kişi"
+
+#. Describe what the user can do
+#: 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> Lütfen bu bilgilerin doğruluğunu denetledikten sonra, aşağıdaki menüden "
+"bir işlem seçiniz."
+
+#: calendar/gui/e-itip-control.c:779
+msgid "<i>None</i>"
+msgstr "<i>Hiçbiri</i>"
+
+#: calendar/gui/e-itip-control.c:789
+#, fuzzy
+msgid "Location:"
+msgstr "_Konum: "
+
+#: calendar/gui/e-itip-control.c:803
+msgid "Status:"
+msgstr "Durum:"
+
+#: 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 "Onaylandı"
+
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Girişimli"
+
+#: 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 "Reddedildi"
+
+#: 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:834
+#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
+msgid "Unknown"
+msgstr "Bilinmiyor"
+
+#: 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 "Bir eylem seçin:"
+
+#: calendar/gui/e-itip-control.c:874
+msgid "Update"
+msgstr "Güncelle"
+
+#: 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 "Tamam"
+
+#: calendar/gui/e-itip-control.c:902
+msgid "Accept"
+msgstr "Onayla"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Girişimli"
+
+#: calendar/gui/e-itip-control.c:904
+msgid "Decline"
+msgstr "Reddet"
+
+#: calendar/gui/e-itip-control.c:928
+msgid "Send Free/Busy Information"
+msgstr "Boş/Meşgul Bilgisi Gönder"
+
+#: calendar/gui/e-itip-control.c:941
+msgid "Update respondent status"
+msgstr "Cevaplayan Bilgisini Güncelle"
+
+#: calendar/gui/e-itip-control.c:954
+msgid "Send Latest Information"
+msgstr "Güncel Bilgiyi Gönder"
+
+#: 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 "İptal"
+
+#: calendar/gui/e-itip-control.c:1045
+#, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
 
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> görev bilgisi yayınladı."
+#: calendar/gui/e-itip-control.c:1046
+msgid "Meeting Information"
+msgstr "Toplantı Bilgisi"
 
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> bir boş/meşgul isteğine cevap verdi."
+#: calendar/gui/e-itip-control.c:1050
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> sizin toplantıda olmanızı istiyor."
+
+#: calendar/gui/e-itip-control.c:1051
+msgid "Meeting Proposal"
+msgstr "Toplantı Taslağı"
+
+#: calendar/gui/e-itip-control.c:1055
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> mevcut bir toplantıya ekleme yapmak istiyor"
+
+#: calendar/gui/e-itip-control.c:1056
+msgid "Meeting Update"
+msgstr "Toplantı Güncellemesi"
 
+#: calendar/gui/e-itip-control.c:1060
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> son toplantı bilgisini almak istiyor."
+
+#: calendar/gui/e-itip-control.c:1061
+msgid "Meeting Update Request"
+msgstr "Toplantı Güncelleme Bilgisi İsteği"
+
+#: calendar/gui/e-itip-control.c:1068
+#, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> bir toplantı isteğine cevap verdi."
 
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> bir görev tanımına cevap verdi."
+#: calendar/gui/e-itip-control.c:1069
+msgid "Meeting Reply"
+msgstr "Toplantı Yanıtı"
 
+#: calendar/gui/e-itip-control.c:1076
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> bir toplantıyı iptal etti."
+
+#: calendar/gui/e-itip-control.c:1077
+msgid "Meeting Cancellation"
+msgstr "Toplantı İptali"
+
+#: 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> hatalı bir mesaj gönderdi."
 
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> bir görevi tamamlamanızı istiyor."
+#: calendar/gui/e-itip-control.c:1085
+msgid "Bad Meeting Message"
+msgstr "Hatalı Toplantı İletisi"
 
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> sizden boş/meşgul bilgisini almak istiyor."
+#: calendar/gui/e-itip-control.c:1106
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> görev bilgisi yayınladı."
 
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> sizin toplantıda olmanızı istiyor."
+#: calendar/gui/e-itip-control.c:1107
+msgid "Task Information"
+msgstr "Görev Bilgisi"
 
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> mevcut bir toplantıya ekleme yapmak istiyor"
+#: calendar/gui/e-itip-control.c:1111
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> bir görevi tamamlamanızı istiyor."
 
+#: calendar/gui/e-itip-control.c:1112
+msgid "Task Proposal"
+msgstr "Görev Taslağı"
+
+#: calendar/gui/e-itip-control.c:1116
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> mevcut bir göreve eklenti yapmak istiyor."
 
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> son toplantı bilgisini almak istiyor."
+#: calendar/gui/e-itip-control.c:1117
+msgid "Task Update"
+msgstr "Görev Güncellemesi"
 
+#: calendar/gui/e-itip-control.c:1121
+#, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> en güncel görev bilgisini almak istiyor."
 
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
-"<b>"
-msgstr "<b>(Burada düzenlenmesi mümkün olmayan bir bilgi vardır.)<b>"
+#: calendar/gui/e-itip-control.c:1122
+msgid "Task Update Request"
+msgstr "Güncel Görev Bilgisi İsteği"
 
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+#: calendar/gui/e-itip-control.c:1129
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> bir görev tanımına cevap verdi."
+
+#: calendar/gui/e-itip-control.c:1130
+msgid "Task Reply"
+msgstr "Görev Yanıtı"
+
+#: calendar/gui/e-itip-control.c:1137
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> bir görevi iptal etti."
+
+#: calendar/gui/e-itip-control.c:1138
+msgid "Task Cancellation"
+msgstr "Görev İptali"
+
+#: calendar/gui/e-itip-control.c:1146
+msgid "Bad Task Message"
+msgstr "Hatalı Görev İletisi"
+
+#: calendar/gui/e-itip-control.c:1165
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> boş/meşgul bilgisi gönderdi."
+
+#: calendar/gui/e-itip-control.c:1166
+msgid "Free/Busy Information"
+msgstr "Boş/Meşgul Bilgisi"
+
+#: calendar/gui/e-itip-control.c:1170
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> sizden boş/meşgul bilgisini almak istiyor."
+
+#: calendar/gui/e-itip-control.c:1171
+msgid "Free/Busy Request"
+msgstr "Boş/Meşgul İsteği"
+
+#: calendar/gui/e-itip-control.c:1175
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> bir boş/meşgul isteğine cevap verdi."
+
+#: calendar/gui/e-itip-control.c:1176
+msgid "Free/Busy Reply"
+msgstr "Boş/Meşgul Cevabı"
+
+#: calendar/gui/e-itip-control.c:1181
+msgid "Bad Free/Busy Message"
+msgstr "Hatalı Boş/Meşgul İletisi"
+
+#: calendar/gui/e-itip-control.c:1236
+msgid "The message does not appear to be properly formed"
+msgstr "Bu mesaj düzgün değil"
+
+#: calendar/gui/e-itip-control.c:1298
+msgid "The message contains only unsupported requests."
+msgstr "Bu iletide desteklenmeyen bilgiler var."
+
+#: 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 "Bu eklenti geçerli bir takvim mesajını içermiyor."
+
+#: calendar/gui/e-itip-control.c:1357
+msgid "The attachment has no viewable calendar items"
+msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
+
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+msgid "Object is invalid and cannot be updated\n"
 msgstr ""
-"<br> Lütfen bu bilgilerin doğruluğunu denetledikten sonra, aşağıdaki menüden "
-"bir işlem seçiniz."
 
-msgid "<click here to select a date>"
-msgstr "<bir tarih seçmek için tıklayınız>"
+#: 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 ""
 
-msgid "<click here to select a folder>"
-msgstr "<bir dizin seçmek için tıklayın>"
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Öğe gönderilemedi!\n"
 
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>Hava durumu sunucusuna bağlantı kurulamadı</b></dd>"
+#: calendar/gui/e-itip-control.c:1517
+msgid "You do not have the right permissions to update the calendar\n"
+msgstr ""
 
-msgid "<i>None</i>"
-msgstr "<i>Hiçbiri</i>"
+#: calendar/gui/e-itip-control.c:1520
+msgid "Update complete\n"
+msgstr "Güncelleme tamamlandı\n"
+
+#: calendar/gui/e-itip-control.c:1523
+msgid "Calendar file could not be updated!\n"
+msgstr "Takvim dosyası güncellenemedi!\n"
+
+#: 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 "Bu öğe yerinde bulunamadığı için katılımcı bilgileri güncellenemedi"
+
+#: 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:1585
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr "Katılımcı bilgileri geçersiz bir durum nedeniyle güncellenemedi!\n"
+
+#: calendar/gui/e-itip-control.c:1609
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1612
+msgid "Attendee status updated\n"
+msgstr "Katılımcı bilgileri güncellendi\n"
+
+#: calendar/gui/e-itip-control.c:1615
+msgid "Attendee status could not be updated!\n"
+msgstr "Katılımcı bilgileri güncellenemedi!\n"
+
+#: calendar/gui/e-itip-control.c:1650
+msgid "Removal Complete"
+msgstr "Bitiş Tamamlandı"
+
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+msgid "Item sent!\n"
+msgstr "Öğe gönderildi!\n"
+
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+msgid "The item could not be sent!\n"
+msgstr "Öğe gönderilemedi!\n"
+
+#: calendar/gui/e-itip-control.c:1807
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Dizini Seçin"
+
+#: calendar/gui/e-itip-control.c:1814
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Dizini Seçin"
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %% "
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr "--kime--"
+
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
+msgstr "Takvim İletisi"
+
+#: calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr "Tarih:"
+
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Takvim Yükleniyor"
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr "Takvim yükleniyor..."
+
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr "Sunucu Mesajı:"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "bitiş-tarihi"
+
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "başlangıç-tarihi"
+
+#: calendar/gui/e-meeting-model.c:84
+msgid "Chair Persons"
+msgstr "Toplantıyı Yönetenler"
+
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+msgid "Required Participants"
+msgstr "Gerekli Katılımcılar"
+
+#: calendar/gui/e-meeting-model.c:86
+msgid "Optional Participants"
+msgstr "Seçimlik Katılımcılar"
+
+#: calendar/gui/e-meeting-model.c:87
+#, fuzzy
+msgid "Resources"
+msgstr "Kaynak"
+
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+msgid "Individual"
+msgstr "Bireysel"
+
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:831
+msgid "Group"
+msgstr "Grup"
+
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:832
+msgid "Resource"
+msgstr "Kaynak"
+
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:833
+msgid "Room"
+msgstr "Oda"
+
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:846
+msgid "Chair"
+msgstr "Sandalye"
+
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+msgid "Required Participant"
+msgstr "Gerekli Katılımcı"
+
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:848
+msgid "Optional Participant"
+msgstr "Seçimlik Katılımcı"
+
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:849
+msgid "Non-Participant"
+msgstr "Katılmayan"
+
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c: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:879
+#, fuzzy
+msgid "Delegated"
+msgstr "Silinen"
+
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+msgid "In Process"
+msgstr "İşlemde"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2114
+msgid "%A, %B %d, %Y"
+msgstr "%d %B %A, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%d %b %Y %a"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:439
+msgid "Out of Office"
+msgstr "Ofiste Değil"
+
+#: calendar/gui/e-meeting-time-sel.c:440
+msgid "No Information"
+msgstr "Bilgi Yok"
+
+#: calendar/gui/e-meeting-time-sel.c:478
+msgid "_Options"
+msgstr "_Seçenekler"
+
+#: calendar/gui/e-meeting-time-sel.c:495
+msgid "Show _Only Working Hours"
+msgstr "_Sadece Çalışma Saatlerini Göster"
 
+#: calendar/gui/e-meeting-time-sel.c:508
+msgid "Show _Zoomed Out"
+msgstr "_Uzaklaştırılmış Göster"
+
+#: calendar/gui/e-meeting-time-sel.c:526
+msgid "_Update Free/Busy"
+msgstr "_Boş/Meşgul Olanları Güncelle"
+
+#: calendar/gui/e-meeting-time-sel.c:544
+msgid "_<<"
+msgstr "_<<"
+
+#: calendar/gui/e-meeting-time-sel.c:561
+msgid "_Autopick"
+msgstr "_Otomatikman seç"
+
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-msgid "?"
-msgstr "?"
+#: calendar/gui/e-meeting-time-sel.c:592
+msgid "_All People and Resources"
+msgstr "_Tüm Kişiler ve Kaynaklar"
 
-msgid "A Bonobo control for an address popup."
-msgstr "Adres menüsü için Bonobo denetleyici"
+#: calendar/gui/e-meeting-time-sel.c:605
+msgid "All _People and One Resource"
+msgstr "Tüm _Kişiler ve Bir Kaynak"
 
-msgid "A Bonobo control for displaying an address."
-msgstr "Adres gösteren örnek bir Bonobo denetleyici"
+#: calendar/gui/e-meeting-time-sel.c:618
+msgid "_Required People"
+msgstr "_Gerekli Kişiler"
 
-msgid "A Bonobo control which displays a task list."
-msgstr "Görev listesi gösteren örnek bir Bonobo denetleyici."
+#: calendar/gui/e-meeting-time-sel.c:631
+msgid "Required People and _One Resource"
+msgstr "Gerekli Kişiler ve _Bir Kaynak"
+
+#: calendar/gui/e-meeting-time-sel.c:654
+msgid "Meeting _start time:"
+msgstr "Toplantı b_aşlama saati :"
+
+#: calendar/gui/e-meeting-time-sel.c:673
+msgid "Meeting _end time:"
+msgstr "Toplantı _bitiş saati:"
+
+#: 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 tarihinde görevler açılıyor"
 
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "%s içindeki görevler yüklenemedi."
+
+#: calendar/gui/e-tasks.c:393
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "`%s' yüklemek için gereken yöntem desteklenmiyor"
+
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "`%s' dizini açılamadı."
+
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
 msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+"Error on %s:\n"
+" %s"
 msgstr ""
-"Aynı isimde bir dosya zaten var\n"
-"Üzerine yazılsın mı?"
+"'%s' sırasında hata:\n"
+"%s"
 
-msgid "A folder with the same name already exists"
-msgstr "Aynı isimli bir dizin zaten var"
+#: calendar/gui/e-tasks.c:540
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Tamamlanma Tarihi"
 
-msgid "A password transition is needed"
-msgstr "Parola iletimi gerekiyor"
+#: calendar/gui/e-tasks.c:563
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Seçilen bağlantılar siliniyor"
 
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Adres defteri gösteren örnek bir Bonobo denetleyici"
+#: calendar/gui/e-tasks.c:656
+#, fuzzy
+msgid "Expunging"
+msgstr "Dizin siliniyor"
 
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Takvim gösteren örnek bir Bonobo denetleyici."
+#: calendar/gui/e-week-view.c:3515
+msgid "New _Appointment..."
+msgstr "Yeni _Randevu..."
 
-msgid "AUTH request failed."
-msgstr "AUTH isteği başarısız."
+#: calendar/gui/gnome-cal.c:1524
+#, c-format
+msgid "Could not open the folder in `%s'"
+msgstr "`%s' dizini açılamadı."
 
-msgid "AUTH request timed out: %s"
-msgstr "AUTH isteği zaman aşımına uğradı: %s"
+#: calendar/gui/gnome-cal.c:1535
+#, c-format
+msgid "The method required to open `%s' is not supported"
+msgstr "`%s' açmak için gereken yöntem desteklenmiyor"
 
-msgid "A_dd"
-msgstr "_Ekle"
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "%s tarihinde Alarm"
 
-msgid "A_ll day event"
-msgstr "_Tüm gün olayları"
+#: calendar/gui/gnome-cal.c:1761
+#, c-format
+msgid ""
+"The calendar backend for\n"
+"%s\n"
+" has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
 
-msgid "A_ssistant's name:"
-msgstr "_Sekreterinin adı:"
+#: calendar/gui/gnome-cal.c:1766
+#, c-format
+msgid ""
+"The task backend for\n"
+"%s\n"
+" has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
 
-msgid "Aarhus"
-msgstr "Aarhus"
+#: calendar/gui/gnome-cal.c:1990
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "%s tarihinde takvim açılıyor"
 
-msgid "Abakan"
-msgstr "Abakan"
+#: calendar/gui/gnome-cal.c:2029
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "%s dizini açılıyor"
 
-msgid "Abbotsford"
-msgstr "Abbotsford"
+#: calendar/gui/goto-dialog.glade.h:1
+msgid "April"
+msgstr "Nisan"
 
-msgid "Aberdeen"
-msgstr "Aberdeen"
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr "Ağustos"
 
-msgid "Abha"
-msgstr "Abha"
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr "Eylül"
 
-msgid "Abilene"
-msgstr "Abilene"
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr "Şubat"
 
-msgid "Abingdon"
-msgstr "Abingdon"
+#: calendar/gui/goto-dialog.glade.h:5
+msgid "Go To Date"
+msgstr "Tarihe Git"
 
-msgid "About Ximian Evolution"
-msgstr "Ximian Evolution Hakkında"
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
+msgstr "Bugüne Git"
 
-msgid "About Ximian Evolution..."
-msgstr "Ximian Evolution Hakkında..."
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "January"
+msgstr "Ocak"
 
-msgid "Abu Dhabi"
-msgstr "Abu Dhabi"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "July"
+msgstr "Temmuz"
 
-msgid "Abu Dhabi - Bateen"
-msgstr "Abu Dhabi - Bateen"
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "June"
+msgstr "Haziran"
 
-msgid "Acajutla"
-msgstr "Acajutla"
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "March"
+msgstr "Mart"
 
-msgid "Acapulco"
-msgstr "Acapulco"
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "May"
+msgstr "Mayıs"
 
-msgid "Acarigua"
-msgstr "Acarigua"
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "November"
+msgstr "Kasım"
 
-msgid "Accept"
-msgstr "Onayla"
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "October"
+msgstr "Ekim"
 
-msgid "Accepted"
-msgstr "Onaylandı"
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "September"
+msgstr "Eylül"
 
-msgid "Account"
-msgstr "Hesap"
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+msgid "An organizer must be set."
+msgstr "Bir düzenleyen kişi olmak zorunda."
 
-msgid "Account %d"
-msgstr "Hesap %d"
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "En az bir katılımcı olmak zorunda"
 
-msgid "Account Information"
-msgstr "Hesap Bilgisi"
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+msgid "Event information"
+msgstr "Olay bilgisi"
 
-msgid "Account Management"
-msgstr "Hesap Yöneticisi"
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+msgid "Task information"
+msgstr "Görev bilgisi"
 
-msgid "Account Name"
-msgstr "Hesap Adı:"
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#, fuzzy
+msgid "Journal information"
+msgstr "Seçimlik Bilgi"
 
-msgid "Accounts"
-msgstr "Hesaplar"
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+msgid "Free/Busy information"
+msgstr "Boş/Meşgul bilgisi"
 
-msgid "Active connections"
-msgstr "Etkin bağlantılar"
+#: calendar/gui/itip-utils.c:480
+msgid "Calendar information"
+msgstr "Takvim bilgisi"
 
-msgid "Adak"
-msgstr "Adak"
+#: calendar/gui/itip-utils.c:516
+msgid "Updated"
+msgstr "Güncellendi"
 
-msgid "Adana"
-msgstr "Adana"
+#: calendar/gui/itip-utils.c:524
+msgid "Refresh"
+msgstr "Tazele"
 
-msgid "Adana/Incirlik"
-msgstr "Adana/İncirlik"
+#: calendar/gui/itip-utils.c:528
+msgid "Counter-proposal"
+msgstr ""
 
-msgid "Add Addressbook"
-msgstr "Adres Defterine Ekle"
+#: calendar/gui/itip-utils.c:596
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Boş/Meşgul bilgisi"
 
-msgid "Add Anyway"
-msgstr "Ekle Gitsin"
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "Takvim bilgisi"
 
-msgid "Add Filter Rule"
-msgstr "Filtre Kuralı Ekle"
+#: calendar/gui/itip-utils.c:766
+msgid "You must be an attendee of the event."
+msgstr "Bu olayda bir katılımcı olarak görünmeniz gerekiyor."
 
-msgid "Add Rule"
-msgstr "Görev Ekle"
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Bonobo'yu başlatamadım"
 
-msgid "Add Sender to Address Book"
-msgstr "Göndereni Adres Defterine Ekle"
+#: calendar/gui/main.c:99
+msgid "Could not create the component editor factory"
+msgstr "Bileşen düzenleyici mimarisi oluşturulamadı."
 
-msgid "Add a news feed"
-msgstr "Yeni bir haber grubu ekle"
+#: calendar/gui/print.c:456
+msgid "1st"
+msgstr "1."
 
-msgid "Add action"
-msgstr "Eylem ekle"
+#: calendar/gui/print.c:456
+msgid "2nd"
+msgstr "2."
 
-msgid "Add address to existing contact \"%s\""
-msgstr "\"%s\" bağlantısına adres ekle"
+#: calendar/gui/print.c:456
+msgid "3rd"
+msgstr "3."
 
-msgid "Add attachment..."
-msgstr "Dosya ekle..."
+#: calendar/gui/print.c:456
+msgid "4th"
+msgstr "4."
 
-msgid "Add criterion"
-msgstr "Sınıf ekle"
+#: calendar/gui/print.c:456
+msgid "5th"
+msgstr "5."
 
-msgid "Add folder to your list of subscribed folders"
-msgstr "Bu dizini üye dizinler listesine ekle"
+#: calendar/gui/print.c:457
+msgid "6th"
+msgstr "6."
 
-msgid "Add n_ews feed"
-msgstr "Haber grubu _ekle"
+#: calendar/gui/print.c:457
+msgid "7th"
+msgstr "7."
 
-msgid "Add to Contacts"
-msgstr "Bağlantılara Ekle"
+#: calendar/gui/print.c:457
+msgid "8th"
+msgstr "8."
 
-msgid "Add to Saved Searches"
-msgstr "_Kayıtlı Aramalara Ekle..."
+#: calendar/gui/print.c:457
+msgid "9th"
+msgstr "8."
 
-msgid "Add to _Shortcut Bar"
-msgstr "_Kısayol Çubuğuna Ekle"
+#: calendar/gui/print.c:457
+msgid "10th"
+msgstr "10."
 
-msgid "Add_ress..."
-msgstr "_Adres..."
+#: calendar/gui/print.c:458
+msgid "11th"
+msgstr "11."
 
-msgid "Adding card to LDAP server..."
-msgstr "LDAP sunucuya kart ekleniyor..."
+#: calendar/gui/print.c:458
+msgid "12th"
+msgstr "12."
 
-msgid "Address Cards"
-msgstr "Adres Kartları"
+#: calendar/gui/print.c:458
+msgid "13th"
+msgstr "13."
 
-msgid "Address _2:"
-msgstr "_2. Adres:"
+#: calendar/gui/print.c:458
+msgid "14th"
+msgstr "14."
 
-msgid "Addressbook"
-msgstr "Adres Defteri"
+#: calendar/gui/print.c:458
+msgid "15th"
+msgstr "15."
 
-msgid "Addressbook Sources"
-msgstr "Adres Defteri Kaynakları"
+#: calendar/gui/print.c:459
+msgid "16th"
+msgstr "16."
 
-msgid "Addressbook..."
-msgstr "Adres Defteri..."
+#: calendar/gui/print.c:459
+msgid "17th"
+msgstr "17."
 
-msgid "Adelaide"
-msgstr "Adelaide"
+#: calendar/gui/print.c:459
+msgid "18th"
+msgstr "18."
 
-msgid "Aden"
-msgstr "Aden"
+#: calendar/gui/print.c:459
+msgid "19th"
+msgstr "19."
 
-msgid "Adrar"
-msgstr "Adrar"
+#: calendar/gui/print.c:459
+msgid "20th"
+msgstr "20."
 
-msgid "Advanced"
-msgstr "Gelişmiş"
+#: calendar/gui/print.c:460
+msgid "21st"
+msgstr "21."
 
-msgid "Advanced Search"
-msgstr "Gelişmiş Arama"
+#: calendar/gui/print.c:460
+msgid "22nd"
+msgstr "22."
 
-msgid "Advanced..."
-msgstr "Gelişmiş..."
+#: calendar/gui/print.c:460
+msgid "23rd"
+msgstr "23."
 
-msgid "Aeroparque"
-msgstr "Aeroparque"
+#: calendar/gui/print.c:460
+msgid "24th"
+msgstr "24."
 
-msgid "Aeropuerto del Norte"
-msgstr "Aeropuerto del Norte"
+#: calendar/gui/print.c:460
+msgid "25th"
+msgstr "25."
 
-msgid "Afghanistan"
-msgstr "Afganistan"
+#: calendar/gui/print.c:461
+msgid "26th"
+msgstr "26."
 
-msgid "Afonsos"
-msgstr "Afonsos"
+#: calendar/gui/print.c:461
+msgid "27th"
+msgstr "27."
 
-msgid "Africa"
-msgstr "Afrika"
+#: calendar/gui/print.c:461
+msgid "28th"
+msgstr "28."
+
+#: calendar/gui/print.c:461
+msgid "29th"
+msgstr "29."
+
+#: calendar/gui/print.c:461
+msgid "30th"
+msgstr "39."
 
+#: calendar/gui/print.c:462
+msgid "31st"
+msgstr "31."
+
+#: calendar/gui/print.c:529
+msgid "Su"
+msgstr "Pz"
+
+#: calendar/gui/print.c:529
+msgid "Mo"
+msgstr "Pt"
+
+#: calendar/gui/print.c:529
+msgid "Tu"
+msgstr "Sa"
+
+#: calendar/gui/print.c:529
+msgid "We"
+msgstr "Ça"
+
+#: calendar/gui/print.c:530
+msgid "Th"
+msgstr "Pe"
+
+#: calendar/gui/print.c:530
+msgid "Fr"
+msgstr "Cu"
+
+#: calendar/gui/print.c:530
+msgid "Sa"
+msgstr "Ct"
+
+#. Day
+#: calendar/gui/print.c:1863
+msgid "Selected day (%a %b %d %Y)"
+msgstr "Seçili gün (%d %b %a %Y)"
+
+#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+msgid "%a %b %d"
+msgstr "%d %b %a"
+
+#: calendar/gui/print.c:1889
+msgid "%a %d %Y"
+msgstr "%d %a %Y"
+
+#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
+#: calendar/gui/print.c:1896
+msgid "%a %b %d %Y"
+msgstr "%d %b %a %Y"
+
+#: calendar/gui/print.c:1900
+#, c-format
+msgid "Selected week (%s - %s)"
+msgstr "Seçili hafta (%s - %s)"
+
+#. Month
+#: calendar/gui/print.c:1908
+msgid "Selected month (%b %Y)"
+msgstr "Seçili ay (%b %Y)"
+
+#. Year
+#: calendar/gui/print.c:1915
+msgid "Selected year (%Y)"
+msgstr "Seçili yıl (%Y)"
+
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Görev"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Durum: %s"
+
+#: calendar/gui/print.c:2324
+#, c-format
+msgid "Priority: %s"
+msgstr "Öncelik: %s"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Biten Yüzde: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategoriler: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Bağlantılar: "
+
+#: calendar/gui/print.c:2430
+msgid "Print Calendar"
+msgstr "Takvimi Yazdır"
+
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
+#: my-evolution/e-summary.c:619
+msgid "Print Preview"
+msgstr "Önizlemeyi Yazdır"
+
+#: calendar/gui/print.c:2550
+msgid "Print Item"
+msgstr "Öğeyi Yazdır"
+
+#: calendar/gui/print.c:2631
+msgid "Print Setup"
+msgstr "Yazdırma Ayarları"
+
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
+
+#: calendar/gui/tasks-control.c:147
+msgid "The URI of the tasks folder to display"
+msgstr "Gösterilecek görevler dizininin URI'si"
+
+#: 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"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
+msgid "Do not ask me again."
+msgstr "Tekrar sorma."
+
+#: calendar/gui/tasks-control.c:618
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Kartları yazdır"
+
+#: calendar/gui/tasks-migrate.c:105
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+"Evolution takvim dizininde bulunan tüm görevleri görevler dizinine aktardı."
+
+#: calendar/gui/tasks-migrate.c:108
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+"Evolution takvim dizininde bulunan görevleri yeni görevler dizinine "
+"göndermeyi denedi, ancak bazı görevler taşınamadı. Bu işlemi daha sonra "
+"tekrar deneyiniz."
+
+#: calendar/gui/tasks-migrate.c:120
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+"`%s' açılamadı. Takvim dizininden görevler dizinine gönderilecek öğe "
+"bulunmuyor."
+
+#: calendar/gui/tasks-migrate.c:133
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr "`%s' yüklemek için gereken yöntem desteklemiyor."
+
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+msgid "SMTWTFS"
+msgstr "PPSÇPCCP"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "VCard dosyalarını Evolution'a aktarım mimarisi."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "VCard dosyalarını Evolution'a aktarır."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "VCard dosyalarını Evolution'a aktarır."
+
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"%s iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:483
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Hatırlatıcı"
+
+#: calendar/importers/icalendar-importer.c:697
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Takvim İletisi"
+
+#: calendar/importers/icalendar-importer.c:722
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution, Pine e-posta dosyaları buldu.\n"
+"Bunların Evolution'a aktarılmasını istiyor musunuz?"
+
+#: calendar/importers/icalendar-importer.c:729
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Takvim"
+
+#: calendar/pcs/query.c:289
+msgid "time-now expects 0 arguments"
+msgstr "time-now hiç argüman istemiyor"
+
+#: calendar/pcs/query.c:313
+msgid "make-time expects 1 argument"
+msgstr "make-time 1 argüman istiyor"
+
+#: calendar/pcs/query.c:318
+msgid "make-time expects argument 1 to be a string"
+msgstr "make-time için birinci argüman bir dizi olmalıdır."
+
+#: calendar/pcs/query.c:326
+msgid "make-time argument 1 must be an ISO 8601 date/time string"
+msgstr "make-time 1. argümanı ISO 8601 tarih/saat bilgisi olmalıdır"
+
+#: calendar/pcs/query.c:355
+msgid "time-add-day expects 2 arguments"
+msgstr "time-add-day 2 argüman istiyor"
+
+#: calendar/pcs/query.c:360
+#, fuzzy
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
+
+#: calendar/pcs/query.c:367
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr "time-add-day 2. argümanı bir sayı istiyor"
+
+#: calendar/pcs/query.c:394
+msgid "time-day-begin expects 1 argument"
+msgstr "time-day-begin bir argüman istiyor"
+
+#: calendar/pcs/query.c:399
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr "time-day-begin birinci argümanı time_t biçiminde istiyor"
+
+#: calendar/pcs/query.c:426
+msgid "time-day-end expects 1 argument"
+msgstr "time-day-end bir argüman istiyor"
+
+#: calendar/pcs/query.c:431
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
+
+#: calendar/pcs/query.c:467
+msgid "get-vtype expects 0 arguments"
+msgstr "get-vtype hiç argüman istemiyor"
+
+#: calendar/pcs/query.c:563
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr "ocrur-in-time-range? iki argüman istiyor"
+
+#: calendar/pcs/query.c:568
+#, fuzzy
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
+
+#: calendar/pcs/query.c:575
+#, fuzzy
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
+
+#: calendar/pcs/query.c:705
+msgid "contains? expects 2 arguments"
+msgstr "contains? iki argüman istiyor"
+
+#: calendar/pcs/query.c:710
+msgid "contains? expects argument 1 to be a string"
+msgstr "contains? birinci argümanı dizgi şeklinde istiyor"
+
+#: calendar/pcs/query.c:717
+msgid "contains? expects argument 2 to be a string"
+msgstr "contains? ikinci argümanı dizgi şeklinde istiyor"
+
+#: calendar/pcs/query.c:734
+#, fuzzy
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr "contains? birinci argümanı dizgi şeklinde istiyor"
+
+#: calendar/pcs/query.c:776
+#, fuzzy
+msgid "has-categories? expects at least 1 argument"
+msgstr "make-time 1 argüman istiyor"
+
+#: 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:876
+#, fuzzy
+msgid "is-completed? expects 0 arguments"
+msgstr "time-now hiç argüman istemiyor"
+
+#: calendar/pcs/query.c:921
+#, fuzzy
+msgid "completed-before? expects 1 argument"
+msgstr "time-day-begin bir argüman istiyor"
+
+#: calendar/pcs/query.c:926
+#, fuzzy
+msgid "completed-before? expects argument 1 to be a time_t"
+msgstr "time-day-begin birinci argümanı time_t biçiminde istiyor"
+
+#: 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 "Diğer hata"
+
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidjan"
 
+#: calendar/zones.h:8
 msgid "Africa/Accra"
 msgstr "Afrika/Accra"
 
+#: calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Addis_Ababa"
 
+#: calendar/zones.h:10
 msgid "Africa/Algiers"
 msgstr "Afrika/Algiers"
 
+#: calendar/zones.h:11
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
+#: calendar/zones.h:12
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
+#: calendar/zones.h:13
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
+#: calendar/zones.h:14
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
+#: calendar/zones.h:15
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
+#: calendar/zones.h:16
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
+#: calendar/zones.h:17
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
+#: calendar/zones.h:18
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
+#: calendar/zones.h:19
 msgid "Africa/Cairo"
 msgstr "Afrika/Cairo"
 
+#: calendar/zones.h:20
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
+#: calendar/zones.h:21
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
+#: calendar/zones.h:22
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
+#: calendar/zones.h:23
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
+#: calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
+#: calendar/zones.h:25
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
+#: calendar/zones.h:26
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
+#: calendar/zones.h:27
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
+#: calendar/zones.h:28
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
+#: calendar/zones.h:29
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
+#: calendar/zones.h:30
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
+#: calendar/zones.h:31
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
+#: calendar/zones.h:32
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
+#: calendar/zones.h:33
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
+#: calendar/zones.h:34
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
+#: calendar/zones.h:35
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
+#: calendar/zones.h:36
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
+#: calendar/zones.h:37
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
+#: calendar/zones.h:38
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
+#: calendar/zones.h:39
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
+#: calendar/zones.h:40
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
+#: calendar/zones.h:41
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
+#: calendar/zones.h:42
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
+#: calendar/zones.h:43
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
+#: calendar/zones.h:44
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
+#: calendar/zones.h:45
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
+#: calendar/zones.h:46
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
+#: calendar/zones.h:47
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
+#: calendar/zones.h:48
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
+#: calendar/zones.h:49
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
+#: calendar/zones.h:50
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
+#: calendar/zones.h:51
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
+#: calendar/zones.h:52
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
+#: calendar/zones.h:53
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
+#: calendar/zones.h:54
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
+#: calendar/zones.h:55
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
+#: calendar/zones.h:56
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
+#: calendar/zones.h:57
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
+#: calendar/zones.h:58
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-msgid "Afyon"
-msgstr "Afyon"
-
-msgid "Agen"
-msgstr "Agen"
-
-msgid "Aguascaliantes"
-msgstr "Aguascaliantes"
-
-msgid "Ahmadabad"
-msgstr "Ahmadabad"
-
-msgid "Ahwaz"
-msgstr "Ahwaz"
-
-msgid "Ainsworth"
-msgstr "Ainsworth"
-
-msgid "Air Force"
-msgstr "Air Force"
-
-msgid "Ajaccio/Campo dell'Oro"
-msgstr "Ajaccio/Campo dell'Oro"
-
-msgid "Akeno Ab"
-msgstr "Akeno Ab"
-
-msgid "Akita Airport"
-msgstr "Akita Airport"
-
-msgid "Akron"
-msgstr "Akron"
-
-msgid "Akrotiri"
-msgstr "Akrotiri"
-
-msgid "Al Ahsa"
-msgstr "Al Ahsa"
-
-msgid "Al Ain"
-msgstr "Al Ain"
-
-msgid "Al Baha"
-msgstr "Al Baha"
-
-msgid "Al Qaysumah"
-msgstr "Al Qaysumah"
-
-msgid "Al-Jouf"
-msgstr "Al-Jouf"
-
-msgid "Al_l stations:"
-msgstr "Tüm _istasyonlar:"
-
-msgid "Alabama"
-msgstr "Alabama"
-
-msgid "Alamogordo"
-msgstr "Alamogordo"
-
-msgid "Alamosa"
-msgstr "Alamosa"
-
-msgid "Alarm Repeat"
-msgstr "Alarm Tekrarı"
-
-msgid "Alarm notification service"
-msgstr "Alarm bilgilendirme servisi"
-
-msgid "Alarm on %s"
-msgstr "%s tarihinde Alarm"
-
-msgid "Alarms"
-msgstr "Uyarılar"
-
-msgid "Alaska"
-msgstr "Alaska"
-
-msgid "Albany"
-msgstr "Albany"
-
-msgid "Albenga"
-msgstr "Albenga"
-
-msgid "Alberta"
-msgstr "Alberta"
-
-msgid "Alborg"
-msgstr "Alborg"
-
-msgid "Albuquerque"
-msgstr "Albuquerque"
-
-msgid "Alderney"
-msgstr "Alderney"
-
-msgid "Alesund"
-msgstr "Alesund"
-
-msgid "Alexandria"
-msgstr "Alexandria"
-
-msgid "Alexandria-Esler"
-msgstr "Alexandria-Esler"
-
-msgid "Alexandria/Nouzha"
-msgstr "Alexandria/Nouzha"
-
-msgid "Alexandroupolis"
-msgstr "Alexandroupolis"
-
-msgid "Algeria"
-msgstr "Arnavutluk"
-
-msgid "Alghero"
-msgstr "Alghero"
-
-msgid "Algona"
-msgstr "Algona"
-
-msgid "Alicante"
-msgstr "Alicante"
-
-msgid "Alice"
-msgstr "Alice"
-
-msgid "Alice Springs"
-msgstr "Alice Springs"
-
-msgid "All _People and One Resource"
-msgstr "Tüm _Kişiler ve Bir Kaynak"
-
-msgid "All _folders:"
-msgstr "Tüm _dizinler"
-
-msgid "All folders"
-msgstr "Tüm dizinler"
-
-msgid "All news _feeds:"
-msgstr "Tüm _haber grupları:"
-
-msgid "Allentown"
-msgstr "Allentown"
-
-msgid "Alliance"
-msgstr "Alliance"
-
-msgid "Alma"
-msgstr "Alma"
-
-msgid "Almeria"
-msgstr "Almeria"
-
-msgid "Alpena"
-msgstr "Alpena"
-
-msgid "Alta"
-msgstr "Alta"
-
-msgid "Altamira"
-msgstr "Altamira"
-
-msgid "Alton"
-msgstr "Alton"
-
-msgid "Altoona"
-msgstr "Altoona"
-
-msgid "Alturas"
-msgstr "Alturas"
-
-msgid "Altus"
-msgstr "Altus"
-
-msgid "Always _sign outgoing messages when using this account"
-msgstr "B_u hesabı kullanırken giden iletileri her zaman imzala"
-
-msgid "Amami Airport"
-msgstr "Amami Airport"
-
-msgid "Amapala"
-msgstr "Amapala"
-
-msgid "Amarillo"
-msgstr "Amarillo"
-
-msgid "Amasya"
-msgstr "Amasya"
-
-msgid "Ambler"
-msgstr "Ambler"
-
-msgid "Amelia"
-msgstr "Amelia"
-
-msgid "Amendola"
-msgstr "Amendola"
-
+#: calendar/zones.h:59
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
+#: calendar/zones.h:60
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
+#: calendar/zones.h:61
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
+#: calendar/zones.h:62
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
+#: calendar/zones.h:63
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
+#: calendar/zones.h:64
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
+#: calendar/zones.h:65
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
+#: calendar/zones.h:66
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
+#: calendar/zones.h:67
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
+#: calendar/zones.h:68
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
+#: calendar/zones.h:69
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
+#: calendar/zones.h:70
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
+#: calendar/zones.h:71
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
+#: calendar/zones.h:72
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
+#: calendar/zones.h:73
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
+#: calendar/zones.h:74
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
+#: calendar/zones.h:75
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
+#: calendar/zones.h:76
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
+#: calendar/zones.h:77
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
+#: calendar/zones.h:78
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
+#: calendar/zones.h:79
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
+#: calendar/zones.h:80
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
+#: calendar/zones.h:81
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
+#: calendar/zones.h:82
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
+#: calendar/zones.h:83
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
+#: calendar/zones.h:84
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
+#: calendar/zones.h:85
 msgid "America/Danmarkshavn"
 msgstr "Amerika/Danmarkshavn"
 
+#: calendar/zones.h:86
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
+#: calendar/zones.h:87
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
+#: calendar/zones.h:88
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
+#: calendar/zones.h:89
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
+#: calendar/zones.h:90
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
+#: calendar/zones.h:91
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
+#: calendar/zones.h:92
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
+#: calendar/zones.h:93
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
+#: calendar/zones.h:94
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
+#: calendar/zones.h:95
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
+#: calendar/zones.h:96
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
+#: calendar/zones.h:97
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
+#: calendar/zones.h:98
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
+#: calendar/zones.h:99
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
+#: calendar/zones.h:100
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
+#: calendar/zones.h:101
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
+#: calendar/zones.h:102
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
+#: calendar/zones.h:103
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
+#: calendar/zones.h:104
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
+#: calendar/zones.h:105
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
+#: calendar/zones.h:106
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
+#: calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
+#: calendar/zones.h:108
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
+#: calendar/zones.h:109
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
+#: calendar/zones.h:110
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
+#: calendar/zones.h:111
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
+#: calendar/zones.h:112
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
+#: calendar/zones.h:113
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
+#: calendar/zones.h:114
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
+#: calendar/zones.h:115
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
+#: calendar/zones.h:116
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
+#: calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
+#: calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
+#: calendar/zones.h:119
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
+#: calendar/zones.h:120
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
+#: calendar/zones.h:121
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
+#: calendar/zones.h:122
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
+#: calendar/zones.h:123
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
+#: calendar/zones.h:124
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
+#: calendar/zones.h:125
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
+#: calendar/zones.h:126
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
+#: calendar/zones.h:127
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
+#: calendar/zones.h:128
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
+#: calendar/zones.h:129
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
+#: calendar/zones.h:130
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
+#: calendar/zones.h:131
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
+#: calendar/zones.h:132
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
+#: calendar/zones.h:133
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
+#: calendar/zones.h:134
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
+#: calendar/zones.h:135
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
+#: calendar/zones.h:136
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
+#: calendar/zones.h:137
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
+#: calendar/zones.h:138
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
+#: calendar/zones.h:139
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
+#: calendar/zones.h:140
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
+#: calendar/zones.h:141
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
+#: calendar/zones.h:142
 msgid "America/North_Dakota/Center"
 msgstr "Amerika/North_Dakota/Center"
 
+#: calendar/zones.h:143
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
+#: calendar/zones.h:144
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
+#: calendar/zones.h:145
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
+#: calendar/zones.h:146
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
+#: calendar/zones.h:147
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
+#: calendar/zones.h:148
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
+#: calendar/zones.h:149
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
+#: calendar/zones.h:150
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
+#: calendar/zones.h:151
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
+#: calendar/zones.h:152
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
+#: calendar/zones.h:153
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
+#: calendar/zones.h:154
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
+#: calendar/zones.h:155
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
+#: calendar/zones.h:156
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
+#: calendar/zones.h:157
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
+#: calendar/zones.h:158
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
+#: calendar/zones.h:159
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
+#: calendar/zones.h:160
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
+#: calendar/zones.h:161
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
+#: calendar/zones.h:162
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
+#: calendar/zones.h:163
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
+#: calendar/zones.h:164
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
+#: calendar/zones.h:165
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
+#: calendar/zones.h:166
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
+#: calendar/zones.h:167
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
+#: calendar/zones.h:168
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
+#: calendar/zones.h:169
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
+#: calendar/zones.h:170
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
+#: calendar/zones.h:171
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
+#: calendar/zones.h:172
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
+#: calendar/zones.h:173
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
+#: calendar/zones.h:174
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
+#: calendar/zones.h:175
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
+#: calendar/zones.h:176
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
+#: calendar/zones.h:177
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-msgid "American Samoa"
-msgstr "Samoa"
-
-msgid "Ames"
-msgstr "Ames"
-
-msgid "Amritsar"
-msgstr "Amritsar"
-
-msgid "Amsterdam"
-msgstr "Amsterdam"
-
-msgid ""
-"An error occurred in copying files into\n"
-"`%s'."
-msgstr ""
-"Dosyalar aşağıdaki dizine kopyalanırken hata oluştu\n"
-"`%s'."
-
-msgid "An organizer must be set."
-msgstr "Bir düzenleyen kişi olmak zorunda."
-
-msgid "An unknown person"
-msgstr "Bilinmeyen kişi"
-
-msgid "Anadyr"
-msgstr "Anadyr"
-
-msgid "Anaktuvuk"
-msgstr "Anaktuvuk"
-
-msgid "Anapa"
-msgstr "Anapa"
-
-msgid "Anchorage"
-msgstr "Anchorage"
-
-msgid "Anchorage - Elmendorf AFB"
-msgstr "Anchorage - Elmendorf AFB"
-
-msgid "Ancona"
-msgstr "Ancona"
-
-msgid "Andahuayla"
-msgstr "Andahuayla"
-
-msgid "Anderson"
-msgstr "Anderson"
-
-msgid "Andorra"
-msgstr "Andora"
-
-msgid "Andoya"
-msgstr "Andoya"
-
-msgid "Andravida"
-msgstr "Andravida"
-
-msgid "Andrews AFB"
-msgstr "Andrews AFB"
-
-msgid "Angleton"
-msgstr "Angleton"
-
-msgid "Angola"
-msgstr "Angola"
-
-msgid "Anguilla"
-msgstr "Anguilla"
-
-msgid "Aniak"
-msgstr "Aniak"
-
-msgid "Ankara/Esenboga"
-msgstr "Ankara/Esenboğa"
-
-msgid "Ankara/Etimesgut"
-msgstr "Ankara/Etimesgut"
-
-msgid "Ann Arbor"
-msgstr "Ann Arbor"
-
-msgid "Annaba"
-msgstr "Annaba"
-
-msgid "Annette"
-msgstr "Annette"
-
-msgid "Anni_versary:"
-msgstr "_Yıldönümü:"
-
-msgid "Anniston"
-msgstr "Anniston"
-
-msgid "Anniv"
-msgstr "Yıldön"
-
-msgid "Anniversary"
-msgstr "Yıldönümü"
-
-msgid "Anonymous"
-msgstr "Anonim"
-
-msgid "Answered"
-msgstr "Cevaplanan"
-
-msgid "Antalya"
-msgstr "Antalya"
-
-msgid "Antarctica"
-msgstr "Antarktika"
-
+#: calendar/zones.h:178
 msgid "Antarctica/Casey"
 msgstr "Antarktika/Casey"
 
+#: calendar/zones.h:179
 msgid "Antarctica/Davis"
 msgstr "Antarktika/Davis"
 
+#: calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktika/DumontDUrville"
 
+#: calendar/zones.h:181
 msgid "Antarctica/Mawson"
 msgstr "Antarktika/Mawson"
 
+#: calendar/zones.h:182
 msgid "Antarctica/McMurdo"
 msgstr "Antarktika/McMurdo"
 
+#: calendar/zones.h:183
 msgid "Antarctica/Palmer"
 msgstr "Antarktika/Palmer"
 
+#: calendar/zones.h:184
 msgid "Antarctica/South_Pole"
 msgstr "Antarktika/South_Pole"
 
+#: calendar/zones.h:185
 msgid "Antarctica/Syowa"
 msgstr "Antarktika/Syowa"
 
+#: calendar/zones.h:186
 msgid "Antarctica/Vostok"
 msgstr "Antarktika/Vostok"
 
-msgid "Antartica"
-msgstr "Antartica"
-
-msgid "Antigo"
-msgstr "Antigo"
-
-msgid "Antigua"
-msgstr "Antigua"
-
-msgid "Antigua And Barbuda"
-msgstr "Antigua ve Barbuda"
-
-msgid "Antigua and Barbuda"
-msgstr "Antigua and Barbuda"
-
-msgid "Antofagasta"
-msgstr "Antofagasta"
-
-msgid "Antwerpen/Deurne"
-msgstr "Antwerpen/Deurne"
-
-msgid "Any Category"
-msgstr "Herhangi bir Kategori"
-
-msgid "Any field contains"
-msgstr "Herhangi bir alanın içeriği"
-
-msgid "Aomori Airport"
-msgstr "Aomori Airport"
-
-msgid "Apalachicola"
-msgstr "Apalachicola"
-
-msgid "Appleton"
-msgstr "Appleton"
-
-msgid "Apply Filters"
-msgstr "Filtreleri Uygula"
-
-msgid "Apply filter rules to the selected messages"
-msgstr "Seçilen iletilere filtre kurallarını uygula"
-
-msgid "Apply filters to new messages in INBOX"
-msgstr "GELEN kutusu içindeki yeni iletilere filtre uygula"
-
-msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Bu sunucudaki GELEN kutusunda bulunan yeni iletilere filtreleri uygula"
-
-msgid "Appointment"
-msgstr "Randevu"
-
-msgid "Appointment - %s"
-msgstr "Randevu - %s"
-
-msgid "Appointments"
-msgstr "Randevular"
-
-msgid "April"
-msgstr "Nisan"
-
-msgid "Aquadilla"
-msgstr "Aquadilla"
-
-msgid "Aracaju"
-msgstr "Aracaju"
-
-msgid "Arad"
-msgstr "Arad"
-
-msgid "Arar"
-msgstr "Arar"
-
-msgid "Araxos"
-msgstr "Araxos"
-
-msgid "Arcata"
-msgstr "Arcata"
-
+#: calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
 msgstr "Arctic/Longyearbyen"
 
-msgid "Ardmore"
-msgstr "Ardmore"
-
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Bu başlıksız günlük girdisini silmek istiyor musunuz?"
-
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Gerçekten bu bağlantıyı\n"
-"silmek istiyor musunuz?"
-
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Gerçekten %d randevuyu silmek istiyor musunuz?"
-
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Gerçekten %d günlük girdisini silmek istiyor musunuz?"
-
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Gerçekten %d görevi silmek istiyor musunuz?"
-
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Gerçekten '%s' randevusunu silmek istiyor musunuz?"
-
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
-
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Gerçekten %s görevini silmek istiyor musunuz?"
-
-msgid "Are you sure you want to delete this account?"
-msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
-
-msgid "Are you sure you want to delete this news account?"
-msgstr "Gerçekten bu haber grubu hesabını silmek istiyor musunuz?"
-
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Gerçekten bu randevuyu silmek istiyor musunuz?"
-
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Gerçekten bu görevi silmek istiyor musunuz?"
-
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Gerçekten %d iletiyi düzenlemek istiyor musunuz?"
-
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Gerçekten %d iletiyi farklı pencerelerde açmak istiyor musunuz?"
-
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Gerçekten %d dizinini silmek istiyor musunuz?"
-
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "Gerçekten %d iletiyi yeniden göndermek istiyor musunuz?"
-
-msgid "Arequipa"
-msgstr "Arequipa"
-
-msgid "Argentina"
-msgstr "Arjantin"
-
-msgid "Arica"
-msgstr "Arica"
-
-msgid "Arizona"
-msgstr "Arizona"
-
-msgid "Arkansas"
-msgstr "Arkansas"
-
-msgid "Arkhangelsk"
-msgstr "Arkhangelsk"
-
-msgid "Arlington"
-msgstr "Arlington"
-
-msgid "Armenia"
-msgstr "Ermenistan"
-
-msgid "Artigas"
-msgstr "Artigas"
-
-msgid "Aruba"
-msgstr "Aruba"
-
-msgid "Asahikawa Ab"
-msgstr "Asahikawa Ab"
-
-msgid "Asahikawa Airport"
-msgstr "Asahikawa Airport"
-
-msgid "Ashburnam"
-msgstr "Ashburnam"
-
-msgid "Asheville"
-msgstr "Asheville"
-
-msgid "Ashfield"
-msgstr "Ashfield"
-
-msgid "Ashiya Ab"
-msgstr "Ashiya Ab"
-
-msgid "Ashland"
-msgstr "Ashland"
-
-msgid "Asia"
-msgstr "Asia"
-
+#: calendar/zones.h:188
 msgid "Asia/Aden"
 msgstr "Asya/Aden"
 
+#: calendar/zones.h:189
 msgid "Asia/Almaty"
 msgstr "Asya/Almaty"
 
+#: calendar/zones.h:190
 msgid "Asia/Amman"
 msgstr "Asya/Amman"
 
+#: calendar/zones.h:191
 msgid "Asia/Anadyr"
 msgstr "Asya/Anadyr"
 
+#: calendar/zones.h:192
 msgid "Asia/Aqtau"
 msgstr "Asya/Aqtau"
 
+#: calendar/zones.h:193
 msgid "Asia/Aqtobe"
 msgstr "Asya/Aqtobe"
 
+#: calendar/zones.h:194
 msgid "Asia/Ashgabat"
 msgstr "Asya/Ashgabat"
 
+#: calendar/zones.h:195
 msgid "Asia/Baghdad"
 msgstr "Asya/Baghdad"
 
+#: calendar/zones.h:196
 msgid "Asia/Bahrain"
 msgstr "Asya/Bahrain"
 
+#: calendar/zones.h:197
 msgid "Asia/Baku"
 msgstr "Asya/Baku"
 
+#: calendar/zones.h:198
 msgid "Asia/Bangkok"
 msgstr "Asya/Bangkok"
 
+#: calendar/zones.h:199
 msgid "Asia/Beirut"
 msgstr "Asya/Beirut"
 
+#: calendar/zones.h:200
 msgid "Asia/Bishkek"
 msgstr "Asya/Bishkek"
 
+#: calendar/zones.h:201
 msgid "Asia/Brunei"
 msgstr "Asya/Brunei"
 
+#: calendar/zones.h:202
 msgid "Asia/Calcutta"
 msgstr "Asya/Calcutta"
 
+#: calendar/zones.h:203
 msgid "Asia/Choibalsan"
 msgstr "Asya/Choibalsan"
 
+#: calendar/zones.h:204
 msgid "Asia/Chongqing"
 msgstr "Asya/Chongqing"
 
+#: calendar/zones.h:205
 msgid "Asia/Colombo"
 msgstr "Asya/Colombo"
 
+#: calendar/zones.h:206
 msgid "Asia/Damascus"
 msgstr "Asya/Damascus"
 
+#: calendar/zones.h:207
 msgid "Asia/Dhaka"
 msgstr "Asya/Dhaka"
 
+#: calendar/zones.h:208
 msgid "Asia/Dili"
 msgstr "Asya/Dili"
 
+#: calendar/zones.h:209
 msgid "Asia/Dubai"
 msgstr "Asya/Dubai"
 
+#: calendar/zones.h:210
 msgid "Asia/Dushanbe"
 msgstr "Asya/Dushanbe"
 
+#: calendar/zones.h:211
 msgid "Asia/Gaza"
 msgstr "Asya/Gaza"
 
+#: calendar/zones.h:212
 msgid "Asia/Harbin"
 msgstr "Asya/Harbin"
 
+#: calendar/zones.h:213
 msgid "Asia/Hong_Kong"
 msgstr "Asya/Hong_Kong"
 
+#: calendar/zones.h:214
 msgid "Asia/Hovd"
 msgstr "Asya/Hovd"
 
+#: calendar/zones.h:215
 msgid "Asia/Irkutsk"
 msgstr "Asya/Irkutsk"
 
+#: calendar/zones.h:216
 msgid "Asia/Istanbul"
 msgstr "Asya/İstanbul"
 
+#: calendar/zones.h:217
 msgid "Asia/Jakarta"
 msgstr "Asya/Jakarta"
 
+#: calendar/zones.h:218
 msgid "Asia/Jayapura"
 msgstr "Asya/Jayapura"
 
+#: calendar/zones.h:219
 msgid "Asia/Jerusalem"
 msgstr "Asya/Jerusalem"
 
+#: calendar/zones.h:220
 msgid "Asia/Kabul"
 msgstr "Asya/Kabul"
 
+#: calendar/zones.h:221
 msgid "Asia/Kamchatka"
 msgstr "Asya/Kamchatka"
 
+#: calendar/zones.h:222
 msgid "Asia/Karachi"
 msgstr "Asya/Karachi"
 
+#: calendar/zones.h:223
 msgid "Asia/Kashgar"
 msgstr "Asya/Kashgar"
 
+#: calendar/zones.h:224
 msgid "Asia/Katmandu"
 msgstr "Asya/Katmandu"
 
+#: calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
 msgstr "Asya/Krasnoyarsk"
 
+#: calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asya/Kuala_Lumpur"
 
+#: calendar/zones.h:227
 msgid "Asia/Kuching"
 msgstr "Asya/Kuching"
 
+#: calendar/zones.h:228
 msgid "Asia/Kuwait"
 msgstr "Asya/Kuwait"
 
+#: calendar/zones.h:229
 msgid "Asia/Macao"
 msgstr "Asya/Macao"
 
+#: calendar/zones.h:230
 msgid "Asia/Macau"
 msgstr "Asya/Macau"
 
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asya/Magadan"
 
+#: calendar/zones.h:232
 msgid "Asia/Makassar"
 msgstr "Asya/Makassar"
 
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asya/Manila"
 
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asya/Muscat"
 
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asya/Nicosia"
 
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asya/Novosibirsk"
 
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asya/Omsk"
 
+#: calendar/zones.h:238
 msgid "Asia/Oral"
 msgstr "Asya/Oral"
 
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asya/Phnom_Penh"
 
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asya/Pontianak"
 
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asya/Pyongyang"
 
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asya/Qatar"
 
+#: calendar/zones.h:243
 msgid "Asia/Qyzylorda"
 msgstr "Asya/Qyzylorda"
 
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asya/Rangoon"
 
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asya/Riyadh"
 
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asya/Saigon"
 
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asya/Sakhalin"
 
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asya/Samarkand"
 
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asya/Seoul"
 
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asya/Shanghai"
 
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asya/Singapore"
 
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asya/Taipei"
 
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asya/Tashkent"
 
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asya/Tbilisi"
 
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asya/Tehran"
 
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asya/Thimphu"
 
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asya/Tokyo"
 
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asya/Ujung_Pandang"
 
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asya/Ulaanbaatar"
 
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asya/Urumqi"
 
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asya/Vientiane"
 
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asya/Vladivostok"
 
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asya/Yakutsk"
 
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asya/Yekaterinburg"
 
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asya/Yerevan"
 
-msgid "Aspen"
-msgstr "Aspen"
-
-msgid "Ass"
-msgstr "Asis"
-
-msgid "Assign Color"
-msgstr "Renk Belirle"
-
-msgid "Assign Score"
-msgstr "Puan Belirt"
-
-msgid "Assign Task"
-msgstr "Görev Ata"
-
-msgid "Assign this task to others"
-msgstr "Bu görevi diğerlerine ata"
-
-msgid "Assigned"
-msgstr "Görevlendirildi"
-
-msgid "Assistant"
-msgstr "Yardımcı"
-
-msgid "Assistant Phone"
-msgstr "Sekreter Telefonu"
-
-msgid "Asswan"
-msgstr "Asswan"
-
-msgid "Astoria"
-msgstr "Astoria"
-
-msgid "Astrakhan"
-msgstr "Astrakhan"
-
-msgid "Asturias"
-msgstr "Asturias"
-
-msgid "Asuncion"
-msgstr "Asuncion"
-
-msgid "At least one attendee is necessary"
-msgstr "En az bir katılımcı olmak zorunda"
-
-msgid "At least one attendee is required."
-msgstr "En az bir katılan olmalıdır."
-
-msgid "Athens"
-msgstr "Athens"
-
-msgid "Athinai"
-msgstr "Athinai"
-
-msgid "Atlanta"
-msgstr "Atlanta"
-
-msgid "Atlantic"
-msgstr "Atlantic"
-
-msgid "Atlantic City"
-msgstr "Atlantic City"
-
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azores"
 
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Canary"
 
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Cape_Verde"
 
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/South_Georgia"
 
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/St_Helena"
 
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-msgid "Atsugi US NAS"
-msgstr "Atsugi US NAS"
+#: calendar/zones.h:277
+msgid "Australia/Adelaide"
+msgstr "Avustralya/Adelaide"
 
-msgid "Attach"
-msgstr "Ekle"
+#: calendar/zones.h:278
+msgid "Australia/Brisbane"
+msgstr "Avustralya/Brisbane"
 
-msgid "Attach a file"
-msgstr "Bir dosya ekle"
+#: calendar/zones.h:279
+msgid "Australia/Broken_Hill"
+msgstr "Avustralya/Broken_Hill"
 
-msgid "Attach a file to the message"
-msgstr "İletiyi bir dosya ekle"
+#: calendar/zones.h:280
+msgid "Australia/Darwin"
+msgstr "Avustralya/Darwin"
 
-msgid "Attachment"
-msgstr "Ek"
+#: calendar/zones.h:281
+msgid "Australia/Hobart"
+msgstr "Avustralya/Hobart"
 
-msgid "Attachment properties"
-msgstr "Ek özellikleri"
+#: calendar/zones.h:282
+msgid "Australia/Lindeman"
+msgstr "Avustralya/Lindeman"
 
-msgid "Attachments"
-msgstr "Ekler"
+#: calendar/zones.h:283
+msgid "Australia/Lord_Howe"
+msgstr "Avustralya/Lord_Howe"
 
-msgid "Attendee"
-msgstr "Katılımcı"
+#: calendar/zones.h:284
+msgid "Australia/Melbourne"
+msgstr "Avustralya/Melbourne"
 
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Bu öğe yerinde bulunamadığı için katılımcı bilgileri güncellenemedi"
+#: calendar/zones.h:285
+msgid "Australia/Perth"
+msgstr "Avustralya/Perth"
 
-msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Katılımcı bilgileri geçersiz bir durum nedeniyle güncellenemedi!\n"
+#: calendar/zones.h:286
+msgid "Australia/Sydney"
+msgstr "Avustralya/Sydney"
 
-msgid "Attendee status could not be updated!\n"
-msgstr "Katılımcı bilgileri güncellenemedi!\n"
+#: calendar/zones.h:287
+msgid "Europe/Amsterdam"
+msgstr "Avrupa/Amsterdam"
 
-msgid "Attendee status updated\n"
-msgstr "Katılımcı bilgileri güncellendi\n"
+#: calendar/zones.h:288
+msgid "Europe/Andorra"
+msgstr "Avrupa/Andorra"
 
-msgid "Auburn"
-msgstr "Auburn"
+#: calendar/zones.h:289
+msgid "Europe/Athens"
+msgstr "Avrupa/Athens"
 
-msgid "Auckland"
-msgstr "Auckland"
+#: calendar/zones.h:290
+msgid "Europe/Belfast"
+msgstr "Avrupa/Belfast"
 
-msgid "Audio Alarm Options"
-msgstr "Ses Alarm Seçenekleri"
+#: calendar/zones.h:291
+msgid "Europe/Belgrade"
+msgstr "Avrupa/Belgrade"
 
-msgid "Augsburg"
-msgstr "Augsburg"
+#: calendar/zones.h:292
+msgid "Europe/Berlin"
+msgstr "Avrupa/Berlin"
 
-msgid "August"
-msgstr "Ağustos"
+#: calendar/zones.h:293
+msgid "Europe/Bratislava"
+msgstr "Avrupa/Bratislava"
 
-msgid "Augusta"
-msgstr "Augusta"
+#: calendar/zones.h:294
+msgid "Europe/Brussels"
+msgstr "Avrupa/Brussels"
 
-msgid "Aurora"
-msgstr "Aurora"
+#: calendar/zones.h:295
+msgid "Europe/Bucharest"
+msgstr "Avrupa/Bucharest"
 
-msgid "Austin"
-msgstr "Austin"
+#: calendar/zones.h:296
+msgid "Europe/Budapest"
+msgstr "Avrupa/Budapest"
 
-msgid "Australasia"
-msgstr "Australasia"
+#: calendar/zones.h:297
+msgid "Europe/Chisinau"
+msgstr "Avrupa/Chisinau"
 
-msgid "Australia"
-msgstr "Avusturalya"
+#: calendar/zones.h:298
+msgid "Europe/Copenhagen"
+msgstr "Avrupa/Copenhagen"
 
-msgid "Australia/Adelaide"
-msgstr "Avustralya/Adelaide"
+#: calendar/zones.h:299
+msgid "Europe/Dublin"
+msgstr "Avrupa/Dublin"
 
-msgid "Australia/Brisbane"
-msgstr "Avustralya/Brisbane"
+#: calendar/zones.h:300
+msgid "Europe/Gibraltar"
+msgstr "Avrupa/Gibraltar"
 
-msgid "Australia/Broken_Hill"
-msgstr "Avustralya/Broken_Hill"
+#: calendar/zones.h:301
+msgid "Europe/Helsinki"
+msgstr "Avrupa/Helsinki"
 
-msgid "Australia/Darwin"
-msgstr "Avustralya/Darwin"
+#: calendar/zones.h:302
+msgid "Europe/Istanbul"
+msgstr "Avrupa/İstanbul"
 
-msgid "Australia/Hobart"
-msgstr "Avustralya/Hobart"
+#: calendar/zones.h:303
+msgid "Europe/Kaliningrad"
+msgstr "Avrupa/Kaliningrad"
 
-msgid "Australia/Lindeman"
-msgstr "Avustralya/Lindeman"
+#: calendar/zones.h:304
+msgid "Europe/Kiev"
+msgstr "Avrupa/Kiev"
 
-msgid "Australia/Lord_Howe"
-msgstr "Avustralya/Lord_Howe"
+#: calendar/zones.h:305
+msgid "Europe/Lisbon"
+msgstr "Avrupa/Lisbon"
 
-msgid "Australia/Melbourne"
-msgstr "Avustralya/Melbourne"
+#: calendar/zones.h:306
+msgid "Europe/Ljubljana"
+msgstr "Avrupa/Ljubljana"
 
-msgid "Australia/Perth"
-msgstr "Avustralya/Perth"
+#: calendar/zones.h:307
+msgid "Europe/London"
+msgstr "Avrupa/London"
 
-msgid "Australia/Sydney"
-msgstr "Avustralya/Sydney"
+#: calendar/zones.h:308
+msgid "Europe/Luxembourg"
+msgstr "Avrupa/Luxembourg"
 
-msgid "Austria"
-msgstr "Avusturya"
+#: calendar/zones.h:309
+msgid "Europe/Madrid"
+msgstr "Avrupa/Madrid"
 
-msgid "Authentication"
-msgstr "Kimlik Denetimi"
+#: calendar/zones.h:310
+msgid "Europe/Malta"
+msgstr "Avrupa/Malta"
 
-msgid "Authentication Failed"
-msgstr "Kimlik Denetimi Başarısız."
+#: calendar/zones.h:311
+msgid "Europe/Minsk"
+msgstr "Avrupa/Minsk"
 
-msgid "Authentication Required"
-msgstr "Kimlik Denetimi İsteniyor"
+#: calendar/zones.h:312
+msgid "Europe/Monaco"
+msgstr "Avrupa/Monaco"
+
+#: calendar/zones.h:313
+msgid "Europe/Moscow"
+msgstr "Avrupa/Moscow"
+
+#: calendar/zones.h:314
+msgid "Europe/Nicosia"
+msgstr "Avrupa/Nicosia"
+
+#: calendar/zones.h:315
+msgid "Europe/Oslo"
+msgstr "Avrupa/Oslo"
+
+#: calendar/zones.h:316
+msgid "Europe/Paris"
+msgstr "Avrupa/Paris"
+
+#: calendar/zones.h:317
+msgid "Europe/Prague"
+msgstr "Avrupa/Prague"
+
+#: calendar/zones.h:318
+msgid "Europe/Riga"
+msgstr "Avrupa/Riga"
+
+#: calendar/zones.h:319
+msgid "Europe/Rome"
+msgstr "Avrupa/Rome"
+
+#: calendar/zones.h:320
+msgid "Europe/Samara"
+msgstr "Avrupa/Samara"
+
+#: calendar/zones.h:321
+msgid "Europe/San_Marino"
+msgstr "Avrupa/San_Marino"
+
+#: calendar/zones.h:322
+msgid "Europe/Sarajevo"
+msgstr "Avrupa/Sarajevo"
+
+#: calendar/zones.h:323
+msgid "Europe/Simferopol"
+msgstr "Avrupa/Simferopol"
+
+#: calendar/zones.h:324
+msgid "Europe/Skopje"
+msgstr "Avrupa/Skopje"
+
+#: calendar/zones.h:325
+msgid "Europe/Sofia"
+msgstr "Avrupa/Sofya"
+
+#: calendar/zones.h:326
+msgid "Europe/Stockholm"
+msgstr "Avrupa/Stockholm"
+
+#: calendar/zones.h:327
+msgid "Europe/Tallinn"
+msgstr "Avrupa/Tallinn"
+
+#: calendar/zones.h:328
+msgid "Europe/Tirane"
+msgstr "Avrupa/Tiran"
+
+#: calendar/zones.h:329
+msgid "Europe/Uzhgorod"
+msgstr "Avrupa/Uzhgorod"
+
+#: calendar/zones.h:330
+msgid "Europe/Vaduz"
+msgstr "Avrupa/Vaduz"
+
+#: calendar/zones.h:331
+msgid "Europe/Vatican"
+msgstr "Avrupa/Vatikan"
+
+#: calendar/zones.h:332
+msgid "Europe/Vienna"
+msgstr "Avrupa/Viyana"
+
+#: calendar/zones.h:333
+msgid "Europe/Vilnius"
+msgstr "Avrupa/Vilnius"
+
+#: calendar/zones.h:334
+msgid "Europe/Warsaw"
+msgstr "Avrupa/Varşova"
+
+#: calendar/zones.h:335
+msgid "Europe/Zagreb"
+msgstr "Avrupa/Zagreb"
+
+#: calendar/zones.h:336
+msgid "Europe/Zaporozhye"
+msgstr "Avrupa/Zaporozhye"
+
+#: calendar/zones.h:337
+msgid "Europe/Zurich"
+msgstr "Avrupa/Zurich"
+
+#: calendar/zones.h:338
+msgid "Indian/Antananarivo"
+msgstr "Hindistan/Antananarivo"
+
+#: calendar/zones.h:339
+#, fuzzy
+msgid "Indian/Chagos"
+msgstr "Hindistan/Cocos"
+
+#: calendar/zones.h:340
+msgid "Indian/Christmas"
+msgstr "Hindistan/Christmas"
+
+#: calendar/zones.h:341
+msgid "Indian/Cocos"
+msgstr "Hindistan/Cocos"
+
+#: calendar/zones.h:342
+msgid "Indian/Comoro"
+msgstr "Indian/Comoro"
+
+#: calendar/zones.h:343
+msgid "Indian/Kerguelen"
+msgstr "Indian/Kerguelen"
+
+#: calendar/zones.h:344
+msgid "Indian/Mahe"
+msgstr "Indian/Mahe"
+
+#: calendar/zones.h:345
+msgid "Indian/Maldives"
+msgstr "Indian/Maldives"
+
+#: calendar/zones.h:346
+msgid "Indian/Mauritius"
+msgstr "Indian/Mauritius"
+
+#: calendar/zones.h:347
+msgid "Indian/Mayotte"
+msgstr "Indian/Mayotte"
+
+#: calendar/zones.h:348
+msgid "Indian/Reunion"
+msgstr "Indian/Reunion"
+
+#: calendar/zones.h:349
+msgid "Pacific/Apia"
+msgstr "Pacific/Apia"
+
+#: calendar/zones.h:350
+msgid "Pacific/Auckland"
+msgstr "Pacific/Auckland"
+
+#: calendar/zones.h:351
+msgid "Pacific/Chatham"
+msgstr "Pacific/Chatham"
+
+#: calendar/zones.h:352
+msgid "Pacific/Easter"
+msgstr "Pacific/Easter"
+
+#: calendar/zones.h:353
+msgid "Pacific/Efate"
+msgstr "Pacific/Efate"
+
+#: calendar/zones.h:354
+msgid "Pacific/Enderbury"
+msgstr "Pacific/Enderbury"
+
+#: calendar/zones.h:355
+msgid "Pacific/Fakaofo"
+msgstr "Pacific/Fakaofo"
+
+#: calendar/zones.h:356
+msgid "Pacific/Fiji"
+msgstr "Pacific/Fiji"
+
+#: calendar/zones.h:357
+msgid "Pacific/Funafuti"
+msgstr "Pacific/Funafuti"
+
+#: calendar/zones.h:358
+msgid "Pacific/Galapagos"
+msgstr "Pacific/Galapagos"
+
+#: calendar/zones.h:359
+msgid "Pacific/Gambier"
+msgstr "Pacific/Gambier"
+
+#: calendar/zones.h:360
+msgid "Pacific/Guadalcanal"
+msgstr "Pacific/Guadalcanal"
+
+#: calendar/zones.h:361
+msgid "Pacific/Guam"
+msgstr "Pacific/Guam"
+
+#: calendar/zones.h:362
+msgid "Pacific/Honolulu"
+msgstr "Pacific/Honolulu"
+
+#: calendar/zones.h:363
+msgid "Pacific/Johnston"
+msgstr "Pacific/Johnston"
+
+#: calendar/zones.h:364
+msgid "Pacific/Kiritimati"
+msgstr "Pacific/Kiritimati"
+
+#: calendar/zones.h:365
+msgid "Pacific/Kosrae"
+msgstr "Pacific/Kosrae"
+
+#: calendar/zones.h:366
+msgid "Pacific/Kwajalein"
+msgstr "Pacific/Kwajalein"
+
+#: calendar/zones.h:367
+msgid "Pacific/Majuro"
+msgstr "Pacific/Majuro"
+
+#: calendar/zones.h:368
+msgid "Pacific/Marquesas"
+msgstr "Pacific/Marquesas"
+
+#: calendar/zones.h:369
+msgid "Pacific/Midway"
+msgstr "Pacific/Midway"
+
+#: calendar/zones.h:370
+msgid "Pacific/Nauru"
+msgstr "Pacific/Nauru"
+
+#: calendar/zones.h:371
+msgid "Pacific/Niue"
+msgstr "Pacific/Niue"
+
+#: calendar/zones.h:372
+msgid "Pacific/Norfolk"
+msgstr "Pacific/Norfolk"
+
+#: calendar/zones.h:373
+msgid "Pacific/Noumea"
+msgstr "Pacific/Noumea"
+
+#: calendar/zones.h:374
+msgid "Pacific/Pago_Pago"
+msgstr "Pacific/Pago_Pago"
+
+#: calendar/zones.h:375
+msgid "Pacific/Palau"
+msgstr "Pacific/Palau"
+
+#: calendar/zones.h:376
+msgid "Pacific/Pitcairn"
+msgstr "Pacific/Pitcairn"
+
+#: calendar/zones.h:377
+msgid "Pacific/Ponape"
+msgstr "Pacific/Ponape"
+
+#: calendar/zones.h:378
+msgid "Pacific/Port_Moresby"
+msgstr "Pacific/Port_Moresby"
+
+#: calendar/zones.h:379
+msgid "Pacific/Rarotonga"
+msgstr "Pacific/Rarotonga"
+
+#: calendar/zones.h:380
+msgid "Pacific/Saipan"
+msgstr "Pacific/Saipan"
+
+#: calendar/zones.h:381
+msgid "Pacific/Tahiti"
+msgstr "Pacific/Tahiti"
+
+#: calendar/zones.h:382
+msgid "Pacific/Tarawa"
+msgstr "Pacific/Tarawa"
+
+#: calendar/zones.h:383
+msgid "Pacific/Tongatapu"
+msgstr "Pacific/Tongatapu"
+
+#: calendar/zones.h:384
+msgid "Pacific/Truk"
+msgstr "Pacific/Truk"
+
+#: calendar/zones.h:385
+msgid "Pacific/Wake"
+msgstr "Pacific/Wake"
+
+#: calendar/zones.h:386
+msgid "Pacific/Wallis"
+msgstr "Pacific/Wallis"
+
+#: calendar/zones.h:387
+msgid "Pacific/Yap"
+msgstr "Pacific/Yap"
+
+#: camel/camel-cipher-context.c:170
+msgid "Signing is not supported by this cipher"
+msgstr "Bu şifreleme ile imza desteklenmiyor"
+
+#: camel/camel-cipher-context.c:210
+msgid "Verifying is not supported by this cipher"
+msgstr "Bu şifreleme ile onaylama desteklenmiyor"
+
+#: camel/camel-cipher-context.c:254
+msgid "Encryption is not supported by this cipher"
+msgstr "Bu şifre ile şifreleme desteklenmiyor"
+
+#: camel/camel-cipher-context.c:296
+msgid "Decryption is not supported by this cipher"
+msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
+
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"Çıkış dosyası yaratılamadı: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:443
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "Önbellek dizini yaratılamadı: %s"
+
+#: camel/camel-disco-diary.c:185
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:248
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+"`%s' açılamadı:\n"
+"%s\n"
+"Bu dizine yapılacak değişiklikler senkronize edilmeyecektir."
+
+#: camel/camel-disco-diary.c:282
+msgid "Resynchronizing with server"
+msgstr "Sunucu ile eşzamanlama yapılıyor"
+
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "'%s' dizinine kaydediliyor"
+
+#: camel/camel-disco-store.c:367
+msgid "You must be working online to complete this operation"
+msgstr "Bu işlemi bitirmek için İnternet bağlantısı sağlamalısınız"
+
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+msgid "Syncing folders"
+msgstr "Dizinler eşzamanlı hale getiriliyor"
+
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "%s filtresini ayrıştırırken hata oldu: %s"
+
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "%s filtresini çalıştırırken hata oldu: %s"
+
+#: camel/camel-filter-driver.c:942
+msgid "Unable to open spool folder"
+msgstr "Spool dizini açılamadı"
+
+#: camel/camel-filter-driver.c:951
+msgid "Unable to process spool folder"
+msgstr "Spool dizini işlenemedi"
+
+#: camel/camel-filter-driver.c:966
+#, c-format
+msgid "Getting message %d (%d%%)"
+msgstr "%d (%%%d) iletisi alınıyor"
+
+#: camel/camel-filter-driver.c:970
+msgid "Cannot open message"
+msgstr "İleti açılamadı"
+
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#, c-format
+msgid "Failed on message %d"
+msgstr "%d iletisinde hata"
+
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+msgid "Syncing folder"
+msgstr "Dizin eşzamanlı hale getiriliyor"
+
+#: camel/camel-filter-driver.c:1071
+#, c-format
+msgid "Getting message %d of %d"
+msgstr "%d/%d ileti alınıyor"
+
+#: camel/camel-filter-driver.c:1086
+#, c-format
+msgid "Failed at message %d of %d"
+msgstr "%d/%d iletisinde hata"
+
+#: camel/camel-filter-search.c:139
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "İletinin açılmasında hata."
+
+#: camel/camel-filter-search.c:387
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Geçersiz argümanlar"
+
+#: camel/camel-filter-search.c:402
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Geçersiz argümanlar"
+
+#: camel/camel-filter-search.c:514
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-filter-search.c:550
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr "%s filtre taramasını çalıştırırken hata oldu: %s"
+
+#: camel/camel-folder-search.c:343
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Arama deyimi ayrıştırılamadı: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:353
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Arama deyimi çalıştırılamadı: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+msgid "(match-all) requires a single bool result"
+msgstr "(hepsini-eşle) boolean sonuç içermelidir"
+
+#: camel/camel-folder-search.c:650
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Bilinmeyen başlık üzerinde arama yapılıyor: %s"
+
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Desteklenmeyen işlem: mesaja ekle: %s için"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Desteklenmeyen işlem: ifade ile ara: %s için"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Desteklenmeyen işlem: uid ile ara: %s için"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "İletiler taşınıyor"
+
+#: camel/camel-folder.c:1319
+#, fuzzy
+msgid "Copying messages"
+msgstr "İletiler %s'e kopyalanıyor"
+
+#: camel/camel-gpg-context.c:713
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:727
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:750
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:758
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:769 camel/camel-gpg-context.c:1228
+#: camel/camel-gpg-context.c:1336 camel/camel-gpg-context.c:1411
+#: camel/camel-gpg-context.c:1469 mail/mail-send-recv.c:540
+msgid "Cancelled."
+msgstr "İptal edildi."
+
+#: camel/camel-gpg-context.c:787
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:793
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "POP sunucusundan beklenmeyen cevap: %s"
+
+#: camel/camel-gpg-context.c:803
+#, fuzzy
+msgid "No data provided"
+msgstr "Dosya adı belirtilmedi."
+
+#: camel/camel-gpg-context.c:848
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1103
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-gpg-context.c:1109
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-gpg-context.c:1219
+#, fuzzy, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-gpg-context.c:1249 camel/camel-gpg-context.c:1328
+#: camel/camel-gpg-context.c:1402 camel/camel-gpg-context.c:1432
+#: camel/camel-gpg-context.c:1460 camel/camel-gpg-context.c:1490
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "İletinin açılmasında hata."
+
+#: camel/camel-gpg-context.c:1313
+#, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:111
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Boru yaratılamadı: %s"
+
+#: camel/camel-lock-client.c:124
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Boru yaratılamadı: %s"
+
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:215
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "%s kilitlenemedi"
+
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "%s için kilitleme dosyası oluşturulamadı: %s"
+
+#: camel/camel-lock.c:152
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"%s dosyasının kilidinin açılmasını beklerken zaman aşımı. Daha sonra yeniden "
+"deneyiniz."
+
+#: camel/camel-lock.c:206
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "fcntl(2) kullanılırken kilitleme hatası: %s"
+
+#: camel/camel-lock.c:268
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "flock(2) kullanılırken kilitleme hatası: %s"
+
+#: camel/camel-movemail.c:107
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "E-posta dosyası %s denetlenemedi: %s"
+
+#: camel/camel-movemail.c:121
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "E-posta dosyası %s açılamadı: %s"
+
+#: camel/camel-movemail.c:129
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr "Geçici e-posta dosyası %s açılamadı: %s"
+
+#: camel/camel-movemail.c:158
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "%s geçici mektup dosyasını oluştururken hata: %s"
+
+#: camel/camel-movemail.c:188
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr "Boru yaratılamadı: %s"
+
+#: camel/camel-movemail.c:200
+#, c-format
+msgid "Could not fork: %s"
+msgstr "Çatallama yapılamadı: %s"
+
+#: camel/camel-movemail.c:238
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr "Movemail programında hata: %s"
+
+#: camel/camel-movemail.c:239
+msgid "(Unknown error)"
+msgstr "(Bilinmeyen hata)"
+
+#: camel/camel-movemail.c:262
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "%s posta dosyasını okurken hata oluştu"
 
+#: camel/camel-movemail.c:273
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Geçici mektup dosyasına yazarken hata: %s"
+
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Geçici mektup dosyasına yazarken hata: %s"
+
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
+msgid "Failed to decrypt MIME part: parse error"
+msgstr ""
+
+#: camel/camel-multipart-signed.c:624
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Diğer hata"
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr "%s yüklenemedi: Bu sistemde modül yükleneme desteklenmiyor."
+
+#: camel/camel-provider.c:140
+#, c-format
+msgid "Could not load %s: %s"
+msgstr "%s yüklenemedi: %s"
+
+#: camel/camel-provider.c:148
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr "%s yüklenemedi: Modülde başlangıç kodu bulunamadı"
+
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr "Anonim"
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr "Bu seçenek sunucuya anonim bağlantı kuracaktır."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Kimlik denetimi başarısız."
 
-msgid "Authentication mechanism is too weak"
-msgstr "Kimlik sınama yöntemi çok zayıf"
+#: camel/camel-sasl-anonymous.c:119
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+"Geçersiz e-posta adres izleme bilgisi:\n"
+"%s"
 
-msgid "Authentication required"
-msgstr "Kimlik denetimi isteniyor"
+#: camel/camel-sasl-anonymous.c:131
+#, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Hatalı opak izleme bilgisi:\n"
+"%s"
 
-msgid "Automatic"
-msgstr "Otomatik"
+#: camel/camel-sasl-anonymous.c:143
+#, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"Hatalı izleme bilgisi:\n"
+"%s"
 
-msgid "Avalon"
-msgstr "Avalon"
+#: camel/camel-sasl-cram-md5.c:35
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
 
-msgid "Aviano"
-msgstr "Aviano"
+#: camel/camel-sasl-cram-md5.c:37
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr "Bu seçenek sunucuya güvenli CRAM-MD5 sistemi ile bağlantı kuracaktır. "
 
-msgid "Ayacucho"
-msgstr "Ayacucho"
+#: camel/camel-sasl-digest-md5.c:43
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
 
-msgid "Azerbaijan"
-msgstr "Azerbaycan"
+#: camel/camel-sasl-digest-md5.c:45
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Bu seçenek sunucuya güvenli DIGEST-MD5 sistemi ile bağlantı kuracaktır. "
 
-msgid "B_usy"
-msgstr "Meşgu_l"
+#: camel/camel-sasl-digest-md5.c:810
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr "Sunucu cevabı çok uzun (>2048 bayt)\n"
 
-msgid "Bad Address"
-msgstr "Hatalı Adres"
+#: camel/camel-sasl-digest-md5.c:819
+msgid "Server challenge invalid\n"
+msgstr "Sunucudan hatalı cevap\n"
 
-msgid "Bad Free/Busy Message"
-msgstr "Hatalı Boş/Meşgul İletisi"
+#: camel/camel-sasl-digest-md5.c:825
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr "Sunucudan hatalı \"Quality of Protection\" anahtarı geldi\n"
 
-msgid "Bad Meeting Message"
-msgstr "Hatalı Toplantı İletisi"
+#: camel/camel-sasl-digest-md5.c:847
+msgid "Server response did not contain authorization data\n"
+msgstr "Sunucu cevabı kimlik denetim bilgisi içermiyor\n"
 
-msgid "Bad Task Message"
-msgstr "Hatalı Görev İletisi"
+#: camel/camel-sasl-digest-md5.c:865
+msgid "Server response contained incomplete authorization data\n"
+msgstr "Sunucu cevabı yetersiz kimlik denetim bilgisis içeriyor\n"
+
+#: camel/camel-sasl-digest-md5.c:875
+msgid "Server response does not match\n"
+msgstr "Sunucu cevabı uyuşmuyor\n"
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:42
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr "Bu seçenek sunucuya Kerberos 4 kimlik denetimi ile bağlanacaktır."
+
+#: camel/camel-sasl-kerberos4.c:161
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kerberos bileti alınamadı:\n"
+"%s"
 
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatalı kimlik sınama yanıtı."
 
-msgid "Bad authentication response from server.\n"
-msgstr "Sunucudan hatalı kimlik sınama yanıtı.\n"
+#: camel/camel-sasl-login.c:32
+#, fuzzy
+msgid "Login"
+msgstr "Logan"
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
+msgstr "Bu seçenek sunucuya basit bir parola kullanarak bağlantı kuracaktır."
+
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr "Bilinmeyen kimlik denetim konumu."
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+#, fuzzy
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr "Bu seçenek sunucuya Kerberos 4 kimlik denetimi ile bağlanacaktır."
+
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr "SMTP öncesi POP"
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+"Bu özellik, SMTP bağlantısı yaratmadan önce bir POP bağlantısı kuracaktır"
+
+#: camel/camel-sasl-popb4smtp.c:107
+msgid "POP Source URI"
+msgstr "POP Kaynak URI adresi"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
+#: camel/camel-search-private.c:113
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Düzgün deyim derleme işlemi başarısız: %s: %s"
+
+#: camel/camel-service.c:282
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr "'%s' URL'inde kullanıcı bilgisi bulunmuyor"
+
+#: camel/camel-service.c:290
+#, c-format
+msgid "URL '%s' needs a host component"
+msgstr "'%s' URL'inde makine adı bilgisi bulunmuyor"
+
+#: camel/camel-service.c:298
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr "'%s' URL'inde dizin bilgisi bulunmuyor"
+
+#: camel/camel-service.c:743
+#, c-format
+msgid "Resolving: %s"
+msgstr "Çözümleniyor: %s"
+
+#: camel/camel-service.c:774 camel/camel-service.c:885
+#, c-format
+msgid "Failure in name lookup: %s"
+msgstr "İsim çözümlemesinde hata: %s"
+
+#: camel/camel-service.c:799
+#, c-format
+msgid "Host lookup failed: %s: host not found"
+msgstr "Makine adı çözümlemesinde hata: %s: Makine bulunamadı"
+
+#: camel/camel-service.c:801
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr "Makine adı çözümlemesinde hata: %s: bilinmeyen hata"
+
+#: camel/camel-service.c:851
+#, fuzzy
+msgid "Resolving address"
+msgstr "Çözümleniyor: %s"
+
+#: camel/camel-service.c:913
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Makine adı çözümlemesinde hata: %s: Makine bulunamadı"
+
+#: camel/camel-service.c:916
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Makine adı çözümlemesinde hata: %s: bilinmeyen hata"
+
+#: camel/camel-session.c:75
+msgid "Virtual folder email provider"
+msgstr "Sanal dizin e-posta sağlayıcısı"
+
+#: camel/camel-session.c:77
+msgid "For reading mail as a query of another set of folders"
+msgstr "diğer bir dizin listesinden alınan iletileri okumak için"
+
+#: camel/camel-session.c:351 camel/camel-session.c:419
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "`%s' protokolü için alıcı yok"
+
+#: camel/camel-session.c:545
+#, c-format
+msgid ""
+"Could not create directory %s:\n"
+"%s"
+msgstr ""
+"%s dizini yaratılamadı:\n"
+"%s"
+
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "%s için parolanızı girin"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "\"%s\" için imza sertifikası bulunmuyor."
+
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "\"%s\" için şifreleme sertifikası bulunmuyor."
+
+#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "\"%s\" için sertifika bulunamadı."
+
+#: camel/camel-smime-context.c:556
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:810
+msgid "Failed to decode message."
+msgstr "İletinin açılmasında hata."
+
+#: camel/camel-smime-context.c:855
+msgid "Failed to verify certificates."
+msgstr "Sertifika denetlenemedi."
+
+#: camel/camel-store.c:244
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Dizin alınamadı: Gerçersiz"
+
+#: camel/camel-store.c:306
+msgid "Cannot create folder: Invalid operation on this store"
+msgstr "Dizin oluşturulamadı: Geçersiz işlem"
+
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Sertifika denetlenemedi."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Sertifika denetlenemedi."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "İmza dosyası kaydedilemedi."
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Sertifika No:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "%s yüklenirken hata oluştu"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Ofiste Değil"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Sertifika denetlenemedi."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Sertifika No:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Geçersiz argüman"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Sertifika No:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Sertifika No:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#, c-format
+msgid ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: 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:532
+msgid "BAD"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
 "\n"
 "%s\n"
 "\n"
+"%s\n"
+"\n"
 "Do you wish to accept anyway?"
 msgstr ""
 "%s adresinden hatalı bir sertifika alındı:\n"
@@ -2469,13499 +8877,17308 @@ msgstr ""
 "\n"
 "Yine de kabul etmek istiyor musunuz?"
 
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:535
+#, fuzzy, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+"%s adresinden hatalı bir sertifika alındı:\n"
+"\n"
+"%s\n"
+"\n"
+"Yine de kabul etmek istiyor musunuz?"
+
+#: camel/camel-url.c:288
+#, c-format
+msgid "Could not parse URL `%s'"
+msgstr "URL açılamadı: %s"
+
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "%s başlatırken hata oluştu"
+
+#: camel/camel-vee-folder.c:656
+#, c-format
+msgid "No such message %s in %s"
+msgstr "Bu isimle bir ileti yok: %s (%s)"
+
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Yeni iletileri tüm dizinlerde denetle"
+
+#: camel/camel-vee-store.c:296
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "%s dizini silinemedi. Geçersiz işlem"
+
+#: camel/camel-vee-store.c:319
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "%s dizini silinemedi: Böyle bir dizin yok"
+
+#: camel/camel-vee-store.c:332
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
+
+#: camel/camel-vee-store.c:340
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
+
+#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:263
+#: camel/providers/imap/camel-imap-command.c:451
+#: camel/providers/imap/camel-imap-store.c:2641
+msgid "Operation cancelled"
+msgstr "İşlem iptal edildi"
+
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
+
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:326
+#, fuzzy, c-format
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
+msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
+
+#: camel/providers/imap/camel-imap-command.c:405
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr "IMAP komutu başarısız oldu: %s"
+
+#: camel/providers/imap/camel-imap-command.c:460
+msgid "Server response ended too soon."
+msgstr "Sunucu cevabı çok erken bitti."
+
+#: camel/providers/imap/camel-imap-command.c:652
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
+
+#: camel/providers/imap/camel-imap-command.c:688
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr "IMAP sunucudan beklenmeyen cevap: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:221
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "%s dizini yaratılamadı: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:240
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "%s için özet bilgisi yüklenemedi"
+
+#: camel/providers/imap/camel-imap-folder.c:306
+msgid "Folder was destroyed and recreated on server."
+msgstr "Sunucudaki dizin silindi ve yeniden oluşturuldu."
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:548
+msgid "Scanning for changed messages"
+msgstr "Değiştirilen iletiler taranıyor"
+
+#: camel/providers/imap/camel-imap-folder.c:1872
+#, fuzzy, c-format
+msgid "Unable to retrieve message: %s"
+msgstr "%s numaralı ileti alınıyor"
+
+#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"İleti alınamadı: %s\n"
+"  %s"
+
+#: 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 "İleti bulunmuyor"
+
+#: 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 ileti kullanılabilir değil"
+
+#: 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 iletilerdeki özet bilgiler alınıyor"
+
+#: camel/providers/imap/camel-imap-folder.c:2565
+msgid "Could not find message body in FETCH response."
+msgstr "FETCH cevabında ileti gövdesi bulunamadı"
+
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Önbellek dizini yaratılamadı: %s"
+
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
+#, c-format
+msgid "Failed to cache message %s: %s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43
+msgid "Checking for new mail"
+msgstr "Yeni iletiler denetleniyor"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+msgid "Check for new messages in all folders"
+msgstr "Yeni iletileri tüm dizinlerde denetle"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+msgid "Folders"
+msgstr "Dizinler"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Show only subscribed folders"
+msgstr "Sadece üye olunan dizinleri göster"
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:54
+msgid "Namespace"
+msgstr "İsim alanı"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr "Bu sunucudaki GELEN kutusunda bulunan yeni iletilere filtreleri uygula"
+
+#: camel/providers/imap/camel-imap-provider.c:63
+msgid "IMAP"
+msgstr "IMAP"
+
+#: camel/providers/imap/camel-imap-provider.c:65
+msgid "For reading and storing mail on IMAP servers."
+msgstr "IMAP sunucuları ileti alma ve göndermede kullanmak için"
+
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+msgid "Password"
+msgstr "Parola"
+
+#: camel/providers/imap/camel-imap-provider.c:82
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"Bu seçenek IMAP sunucusuna açık metin parola kullanarak bağlantı kurulmasını "
+"sağlar."
+
+#: camel/providers/imap/camel-imap-store.c:457
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP sunucu %s"
+
+#: camel/providers/imap/camel-imap-store.c:459
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "SMTP sunucu %s"
+
+#: 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ı iptal edildi"
+
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:272
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "%s adresine bağlantı kurulamadı (%d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"POP sunucusuyla bağlantı kurulamadı.\n"
+"Parola iletiminde hata: %s"
+
+#: camel/providers/imap/camel-imap-store.c:647
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "İşlem desteklenmiyor"
+
+#: camel/providers/imap/camel-imap-store.c:678
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Kimlik denetimi başarısız."
+
+#: camel/providers/imap/camel-imap-store.c:1087
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr "%s IMAP sunucusu %s kimlik sınama yöntemini desteklemiyor"
+
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
+#, c-format
+msgid "No support for authentication type %s"
+msgstr "%s kimlik sınama yöntemi desteklenmiyor"
+
+#: camel/providers/imap/camel-imap-store.c:1121
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr "%sLütfen %s@%s için IMAP parolasını giriniz"
+
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
+msgid "You didn't enter a password."
+msgstr "Bir parola girmediniz."
+
+#: camel/providers/imap/camel-imap-store.c:1165
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"IMAP sunucuyla kimlik denetimi başarısız oldu\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
+#, c-format
+msgid "No such folder %s"
+msgstr "Bu isimde bir dizin yok: `%s'"
+
+#: 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 "Dizin içinde yeni satır karakteri bulunamaz."
+
+#: camel/providers/imap/camel-imap-store.c:1826
+#, fuzzy, c-format
+msgid "Unknown parent folder: %s"
+msgstr "Bilinmeyen hata: %s"
+
+#: camel/providers/imap/camel-imap-store.c:1862
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "Ana dizin üzerinde alt dizin açılamaz"
+
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:352
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "%s posta kutusu açılamadı: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:363
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
+msgstr "MH biçimli e-posta dizinleri"
+
+#: camel/providers/local/camel-local-provider.c:50
+msgid "For storing local mail in MH-like mail directories."
+msgstr "MH benzeri e-posta dizinleri içinde yerel postalar tutmak için."
+
+#: camel/providers/local/camel-local-provider.c:65
+msgid "Local delivery"
+msgstr "Yerel aktarım"
+
+#: camel/providers/local/camel-local-provider.c:66
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
+msgstr ""
+"Standart UNIX posta kutularından ileti alma ve göndermede kullanmak için"
+
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
+msgid "Apply filters to new messages in INBOX"
+msgstr "GELEN kutusu içindeki yeni iletilere filtre uygula"
+
+#: camel/providers/local/camel-local-provider.c:83
+msgid "Maildir-format mail directories"
+msgstr "Maildir biçimli ileti dizinleri"
+
+#: camel/providers/local/camel-local-provider.c:84
+#, fuzzy
+msgid "For storing local mail in maildir directories."
+msgstr "MH benzeri e-posta dizinleri içinde yerel postalar tutmak için."
+
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standart UNIX posta kutusu dosyası"
+
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
+msgid ""
+"For reading and storing local mail in external standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr ""
+"Standart UNIX posta kutularından ileti alma ve göndermede kullanmak için"
+
+#: camel/providers/local/camel-local-store.c:139
+#: 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 saklama dizininde hata"
+
+#: camel/providers/local/camel-local-store.c:146
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "%s saklama dizini geçersiz"
+
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:238
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local stores do not have an inbox"
+msgstr "Yerel disklerde gelen dizini bulunmasın"
+
+#: camel/providers/local/camel-local-store.c:198
+#, c-format
+msgid "Local mail file %s"
+msgstr "Yerel mektup dosyası %s"
+
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "%s dizininin adı %s olarak değiştirilemedi: %s"
+
+#: camel/providers/local/camel-local-store.c:363
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Dizinin adı değiştirilemedi: %s"
+
+#: camel/providers/local/camel-local-store.c:384
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "`%s' dizin özet dosyası silinemedi: %s"
+
+#: camel/providers/local/camel-local-store.c:394
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "`%s' dizin indeks dosyası silinemedi: %s"
+
+#: camel/providers/local/camel-local-summary.c:398
+#, c-format
+msgid "Could not save summary: %s: %s"
+msgstr "Özet kaydedilemedi: %s: %s"
+
+#: camel/providers/local/camel-local-summary.c:454
+msgid "Unable to add message to summary: unknown reason"
+msgstr "İleti özete eklenemedi: bilinmeyen neden"
+
+#: camel/providers/local/camel-maildir-folder.c:184
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "İleti aktarımı iptal edildi"
+
+#: camel/providers/local/camel-maildir-folder.c:187
+#, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "%s dizinine ileti eklenemedi: %s"
+
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
+msgid "Invalid message contents"
+msgstr "Geçersiz ileti içeriği"
+
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Dizin açılamadı: `%s':\n"
+"%s"
+
+#: 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 dizini bulunamadı."
+
+#: camel/providers/local/camel-maildir-store.c:117
+#: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"'%s dizini yaratılamadı:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:132
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' bir maildir dizini."
+
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-mh-store.c:252
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "`%s' dizini silinemedi: %s"
+
+#: camel/providers/local/camel-maildir-store.c:168
+msgid "not a maildir directory"
+msgstr "maildir dizini değil"
+
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
+#, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr "'%s dizini taranamadı: %s"
+
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
+#, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Maildir dizini açılamadı: %s: %s"
+
+#: camel/providers/local/camel-maildir-summary.c:539
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Yeni iletiler denetleniyor"
+
+#: camel/providers/local/camel-maildir-summary.c:640
+#, fuzzy
+msgid "Checking for new messages"
+msgstr "Yeni iletiler taranıyor"
+
+#: camel/providers/local/camel-maildir-summary.c:729
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
+#: camel/providers/local/camel-spool-summary.c:145
+#, fuzzy
+msgid "Storing folder"
+msgstr "'%s' dizinine kaydediliyor"
+
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:148
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "%s üzerinde dizin kilitlemesi yaratılamadı: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:215
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "%s posta kutusu açılamadı: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:274
+msgid "Mail append cancelled"
+msgstr "İleti aktarımı iptal edildi"
+
+#: camel/providers/local/camel-mbox-folder.c:277
+#, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "İleti mbox dosyasına eklenemedi (%s): %s"
+
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:396
+#: camel/providers/local/camel-mbox-folder.c:404
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"%s iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:397
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "Dizin onarılamayacak şekilde bozulmuş."
+
+#: camel/providers/local/camel-mbox-folder.c:405
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr "İletiler düzenlenemiyor: İleti kutusu bozulmuş olabilir."
+
+#: camel/providers/local/camel-mbox-store.c:94
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"`%s' dosyası açılamadı:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:110
+#, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr ""
+"`%s' dosyası yaratılamadı:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
+#, c-format
+msgid "`%s' is not a regular file."
+msgstr "`%s' normal bir dosya değildir."
+
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+"`%s' dizini silinemedi:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:153
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr "`%s' dizini boş değil. Silinmedi."
+
+#: camel/providers/local/camel-mbox-summary.c:350
+#, c-format
+msgid "Could not open folder: %s: %s"
+msgstr "Dizin açılamadı: `%s': %s"
+
+#: camel/providers/local/camel-mbox-summary.c:398
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr "%ld yakınında e-posta ayrıştırma hatası (dizin: %s)"
+
+#: camel/providers/local/camel-mbox-summary.c:453
+#, c-format
+msgid "Cannot check folder: %s: %s"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
+#: camel/providers/local/camel-spool-summary.c:150
+#, c-format
+msgid "Could not open file: %s: %s"
+msgstr "%s dosyası açılamadı: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:169
+#, c-format
+msgid "Cannot open temporary mailbox: %s"
+msgstr "Geçici posta kutusu açılamadı: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr "Kaynak dizin %s açılamadı: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:621
+#, c-format
+msgid "Could not close temp folder: %s"
+msgstr "geçici dizin kapatılamadı: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:632
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr "Dizinin adı değiştirilemedi: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Özet ve dizin uyuşmazlığı"
+
+#: camel/providers/local/camel-mbox-summary.c:848
+#: camel/providers/local/camel-spool-summary.c:332
+#, c-format
+msgid "Unknown error: %s"
+msgstr "Bilinmeyen hata: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:883
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Dizinin adı değiştirilemedi: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:976
+#: camel/providers/local/camel-mbox-summary.c:1001
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Geçici posta kutusuna yazma hatası: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:993
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Geçici dosya kutusuna yazma işlemi başarısız: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "İleti aktarımı iptal edildi"
+
+#: camel/providers/local/camel-mh-folder.c:178
+#, c-format
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "İleti mh dizinine eklenemedi: %s: %s"
+
+#: camel/providers/local/camel-mh-store.c:229
+#, c-format
+msgid "`%s' is not a directory."
+msgstr "`%s' bir dizin değil."
+
+#: camel/providers/local/camel-mh-summary.c:243
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "MH dizin yolu açılamadı: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:118
+#, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:130
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "%s saklama dizini geçersiz"
+
+#: camel/providers/local/camel-spool-store.c:150
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "%s dizini bulunamadı."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' normal bir dosya değildir."
+
+#: camel/providers/local/camel-spool-store.c:193
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:205
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Yerel mektup dosyası %s"
+
+#: camel/providers/local/camel-spool-store.c:205
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "'%s' dizinine kaydediliyor"
+
+#: camel/providers/local/camel-spool-store.c:213
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:221
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Geçici e-posta dosyası %s açılamadı: %s"
+
+#: camel/providers/local/camel-spool-summary.c:214
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "'%s dizini taranamadı: %s"
+
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "USENET news"
+msgstr "USENET haber grubu"
+
+#: camel/providers/nntp/camel-nntp-provider.c:43
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr "USENET haber gruplarından ileti okuma ve gönderme için sağlayıcı."
+
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "%s dizini yaratılamadı: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
+#, c-format
+msgid "USENET News via %s"
+msgstr "%s üzerinden USENET"
+
+#: camel/providers/nntp/camel-nntp-store.c:269
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Bu seçenek NNTP sunucusuna açık metin parola üzerinden kimlik denetimi "
+"yaptırır."
+
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Bu isimde bir dizin yok: `%s'"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Boru yaratılamadı: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "IMAP komutu başarısız oldu: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
+#, fuzzy, c-format
+msgid "%s: Scanning new messages"
+msgstr "Yeni iletiler taranıyor"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Bilinmeyen hata: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "İptal"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "İşlem iptal edildi"
+
+#: camel/providers/pop3/camel-pop3-folder.c:246
+msgid "Retrieving POP summary"
+msgstr "POP özeti alınıyor"
+
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:486
+#: camel/providers/pop3/camel-pop3-folder.c:503
+#, fuzzy
+msgid "User cancelled"
+msgstr "İşlem iptal edildi"
+
+#: camel/providers/pop3/camel-pop3-folder.c:264
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:306
+msgid "Expunging deleted messages"
+msgstr "Silinen iletiler çöpe gönderiliyor"
+
+#: camel/providers/pop3/camel-pop3-folder.c:401
+#, c-format
+msgid "No message with uid %s"
+msgstr "%s kullanıcı numarasıyla ileti yok"
+
+#. Sigh, most of the crap in this function is so that the cancel button
+#. returns the proper exception code.  Sigh.
+#: camel/providers/pop3/camel-pop3-folder.c:408
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "%d. POP iletisi alınıyor"
+
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:488
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:505
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+"İleti alınamadı: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Bilinmeyen hata"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "İleti deposu"
+
+#: camel/providers/pop3/camel-pop3-provider.c:40
+msgid "Leave messages on server"
+msgstr "İletileri sunucuda bırak"
+
+#: camel/providers/pop3/camel-pop3-provider.c:43
+#, c-format
+msgid "Delete after %s day(s)"
+msgstr "%s günden sonra sil"
+
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+msgid "POP"
+msgstr "POP"
+
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "For connecting to and downloading mail from POP servers."
+msgstr "POP sunucularından ileti alma ve göndermede kullanmak için"
+
+#: camel/providers/pop3/camel-pop3-provider.c:71
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"Bu seçenek POP sunucuya açık metin parola kullanarak bağlantı kurar. Pek çok "
+"POP sunucusu tarafından desteklenir."
+
+#: camel/providers/pop3/camel-pop3-provider.c:81
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"Bu seçenek POP sunucuya şifreli APOP protokolünü kullanarak bağlantı kurar."
+
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "%s adresine bağlantı kurulamadı (%d): %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
+msgstr ""
+"POP sunucusuyla bağlantı kurulamadı.\n"
+"Parola iletiminde hata: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:351
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s"
+msgstr "%s üzerindeki POP sunucusuna bağlantı kurulamadı."
+
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr ""
+"POP sunucusuyla bağlantı kurulamadı.\n"
+"Belirtilen kimlik sınama protokolü desteklenmiyor."
+
+#: camel/providers/pop3/camel-pop3-store.c:408
+#, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "KPOP sunucuyla kimlik denetimi başarısız oldu: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:458
+#, fuzzy, c-format
+msgid "%sPlease enter the POP password for %s@%s"
+msgstr "%sLütfen %s@%s için POP3 parolasını girin"
+
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password: %s"
+msgstr ""
+"POP sunucusuyla bağlantı kurulamadı.\n"
+"Parola iletiminde hata: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:609
+#, c-format
+msgid "No such folder `%s'."
+msgstr "Bu isimde bir dizin yok: `%s'"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:110
+msgid "Sendmail"
+msgstr "Sendmail"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr "Yerel sistemdeki sendmail programının iletilerinizi göndermesi için."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "URL açılamadı: %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr "sendmail ile bağlantı kurulamadı: %s: ileti gönderilemedi"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr "sendmail çalıştırılamadı: %s: ileti gönderilemedi"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#, c-format
+msgid "Could not send message: %s"
+msgstr "İleti gönderilemedi: %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr "sendmail %s sinyali ile kapandı: ileti gönderilemedi."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr "%s çalıştırılamadı: ileti gönderilemedi."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr "sendmail %d durumu ile çıktı: ileti gönderilemedi."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
+msgid "sendmail"
+msgstr "sendmail"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
+msgid "Mail delivery via the sendmail program"
+msgstr "Sendmail üzerinden ileti gönderimi"
+
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+msgid "SMTP"
+msgstr "SMTP"
+
+#: camel/providers/smtp/camel-smtp-provider.c:39
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr "SMTP üzerinden bir sunucuya bağlanıp iletilerinizi göndermek için.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:174
+msgid "Syntax error, command unrecognized"
+msgstr "İmla hatası, bilinmeyen komut"
+
+#: camel/providers/smtp/camel-smtp-transport.c:176
+msgid "Syntax error in parameters or arguments"
+msgstr "Parametre ya da argümanlarda imla hatası"
+
+#: camel/providers/smtp/camel-smtp-transport.c:178
+msgid "Command not implemented"
+msgstr "Komut henüz tanınmıyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:180
+msgid "Command parameter not implemented"
+msgstr "Komut parametresi henüz tanınmıyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:182
+msgid "System status, or system help reply"
+msgstr "Sistem durumu, ya da sistem yardım yanıtı"
+
+#: camel/providers/smtp/camel-smtp-transport.c:184
+msgid "Help message"
+msgstr "Yardım mesajı"
+
+#: camel/providers/smtp/camel-smtp-transport.c:186
+msgid "Service ready"
+msgstr "Servis hazır"
+
+#: camel/providers/smtp/camel-smtp-transport.c:188
+msgid "Service closing transmission channel"
+msgstr "Servis iletişim kanalını kapatıyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:190
+msgid "Service not available, closing transmission channel"
+msgstr "Servis uygun değil, iletişim kanalı kapatılıyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:192
+msgid "Requested mail action okay, completed"
+msgstr "İstenen ileti işlemi tamamlandı"
+
+#: camel/providers/smtp/camel-smtp-transport.c:194
+msgid "User not local; will forward to <forward-path>"
+msgstr "Kullanıcı yerel değil, <forward-path> üzerine yönlendirilecek"
+
+#: camel/providers/smtp/camel-smtp-transport.c:196
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr "İstenen ileti eylemi yapılmadı: posta kutusu bulunamadı"
+
+#: camel/providers/smtp/camel-smtp-transport.c:198
+msgid "Requested action not taken: mailbox unavailable"
+msgstr "İstenen eylem yapılmadı: posta kutusu bulunamadı"
+
+#: camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Requested action aborted: error in processing"
+msgstr "İstenen eylem iptal edildi: işlem sırasında hata"
+
+#: camel/providers/smtp/camel-smtp-transport.c:202
+msgid "User not local; please try <forward-path>"
+msgstr "Kullanıcı yerel değil; lütfen <forward-path> deneyin"
+
+#: camel/providers/smtp/camel-smtp-transport.c:204
+msgid "Requested action not taken: insufficient system storage"
+msgstr "İstenen eylem yapılmadı: disk alanı yetersiz"
+
+#: camel/providers/smtp/camel-smtp-transport.c:206
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr "İstenen eylem iptal edildi: disk alanı yetersiz"
+
+#: camel/providers/smtp/camel-smtp-transport.c:208
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr "İstenen eylem yapılmadı: e-posta kutusu izni yok"
+
+#: camel/providers/smtp/camel-smtp-transport.c:210
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr "İleti başlangıcını girin, <CRLF>.<CRLF> ile bitirin."
+
+#: camel/providers/smtp/camel-smtp-transport.c:212
+msgid "Transaction failed"
+msgstr "İletişim kurulamadı"
+
+#: camel/providers/smtp/camel-smtp-transport.c:216
+msgid "A password transition is needed"
+msgstr "Parola iletimi gerekiyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:218
+msgid "Authentication mechanism is too weak"
+msgstr "Kimlik sınama yöntemi çok zayıf"
+
+#: camel/providers/smtp/camel-smtp-transport.c:220
+msgid "Encryption required for requested authentication mechanism"
+msgstr "İstenen kimlik sınama yöntemi için şifreleme gerekiyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:222
+msgid "Temporary authentication failure"
+msgstr "Geçici kimlik denetim hatası"
+
+#: camel/providers/smtp/camel-smtp-transport.c:224
+msgid "Authentication required"
+msgstr "Kimlik denetimi isteniyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:295
+#, fuzzy
+msgid "Welcome response error"
+msgstr "RSET cevap hatası: %s"
+
+#: 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 sunucusuyla bağlantı kurulamadı.\n"
+"Parola iletiminde hata: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "Bu mesaj düzgün değil"
+
+#: camel/providers/smtp/camel-smtp-transport.c:354
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "RSET isteği zaman aşımına uğradı: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:369
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "RSET cevap hatası: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:472
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "%s IMAP sunucusu %s kimlik sınama yöntemini desteklemiyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:510
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sLütfen %s@%s için SMTP parolasını giriniz"
+
+#: camel/providers/smtp/camel-smtp-transport.c:531
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"SMTP sunucuyla kimlik denetimi başarısız oldu\n"
+"%s\n"
+"\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:664
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP sunucu %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "%s üzerinden STMP ileti gönderimi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:684
+msgid "Cannot send message: sender address not valid."
+msgstr "İleti gönderilemiyor: gönderen adresi geçersiz"
+
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+msgid "Sending message"
+msgstr "İleti gönderiliyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:703
+msgid "Cannot send message: no recipients defined."
+msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:713
+#, fuzzy
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:881
+msgid "SMTP Greeting"
+msgstr "SMTP Karşılaması"
+
+#: camel/providers/smtp/camel-smtp-transport.c:927
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET isteği zaman aşımına uğradı: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:949
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET cevap hatası: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1015
+msgid "SMTP Authentication"
+msgstr "SMTP Kimlik Denetimi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1021
+msgid "Error creating SASL authentication object."
+msgstr "SASL kimlik denetim nesnesi yaratılamadı."
+
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr "AUTH isteği zaman aşımına uğradı: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1059
+msgid "AUTH request failed."
+msgstr "AUTH isteği başarısız."
+
+#: camel/providers/smtp/camel-smtp-transport.c:1120
+msgid "Bad authentication response from server.\n"
+msgstr "Sunucudan hatalı kimlik sınama yanıtı.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1145
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr "MAIL FROM zaman aşımı: %s: ileti gönderilmedi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1165
+#, fuzzy
+msgid "MAIL FROM response error"
+msgstr "MAIL FROM zaman aşımı: %s: ileti gönderilmedi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1189
+#, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr "RCPT TO zaman aşımı: %s: ileti gönderilmedi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#, c-format
+msgid "RCPT TO <%s> failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:1253
+#, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "DATA isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
+
+#. we should have gotten instructions on how to use the DATA command:
+#. * 354 Enter mail, end with "." on a line by itself
+#.
+#: camel/providers/smtp/camel-smtp-transport.c:1273
+#, fuzzy
+msgid "DATA response error"
+msgstr "RSET cevap hatası: %s"
+
+#: 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önderimi zaman aşımına uğradı: %s: ileti gönderilmedi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1356
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Sunucudan hatalı kimlik sınama yanıtı."
+
+#: camel/providers/smtp/camel-smtp-transport.c:1379
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr "RSET isteği zaman aşımına uğradı: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1399
+#, fuzzy
+msgid "RSET response error"
+msgstr "RSET cevap hatası: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1422
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH isteği zaman aşımına uğradı: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1442
+#, fuzzy
+msgid "QUIT response error"
+msgstr "RSET cevap hatası: %s"
+
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
+msgstr "%.1fK"
+
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
+msgstr "%.1fM"
+
+#: 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:371 mail/mail-display.c:222
+msgid "attachment"
+msgstr "ek"
+
+#: composer/e-msg-composer-attachment-bar.c:516
+msgid "Remove selected items from the attachment list"
+msgstr "Seçili dosyaları ekler listesinden sil"
+
+#: composer/e-msg-composer-attachment-bar.c:547
+msgid "Add attachment..."
+msgstr "Dosya ekle..."
+
+#: composer/e-msg-composer-attachment-bar.c:548
+msgid "Attach a file to the message"
+msgstr "İletiyi bir dosya ekle"
+
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "%s dosyası eklenemedi: %s"
+
+#: composer/e-msg-composer-attachment.c:177
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "%s dosyası eklenemedi: Normal bir dosya değil."
+
+#: composer/e-msg-composer-attachment.glade.h:1
+msgid "Attachment properties"
+msgstr "Ek özellikleri"
+
+#: composer/e-msg-composer-attachment.glade.h:3
+msgid "File name:"
+msgstr "Dosya adı:"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME türü:"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:163
+msgid "Suggest automatic display of attachment"
+msgstr "Eklentinin otomatik gösterimini öner"
+
+#: composer/e-msg-composer-hdrs.c:364
+msgid "Click here for the address book"
+msgstr "Adres defteri için buraya tıklayın"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:399
+msgid "Reply-To:"
+msgstr "Cevapla:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:410
+msgid "From:"
+msgstr "Gönderen:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:416
+msgid "Subject:"
+msgstr "Konu:"
+
+#: composer/e-msg-composer-hdrs.c:430
+msgid "To:"
+msgstr "Alıcı:"
+
+#: composer/e-msg-composer-hdrs.c:431
+msgid "Enter the recipients of the message"
+msgstr "İletinin gönderildiği kişiler"
+
+#: composer/e-msg-composer-hdrs.c:434
+msgid "Cc:"
+msgstr "Bilgi:"
+
+#: composer/e-msg-composer-hdrs.c:435
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "İletinin kopyasının gönderilecek olunduğu adresler"
+
+#: composer/e-msg-composer-hdrs.c:438
+msgid "Bcc:"
+msgstr "Gizli:"
+
+#: 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."
+msgstr ""
+"İletinin karbon kopyalarının gönderileceği adresi girin. Ancak buraya "
+"girilecek kişiler gönderilenler listesinde görünmeyecektir."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:446
+#, fuzzy
+msgid "Post To:"
+msgstr "Git"
+
+#: composer/e-msg-composer-hdrs.c:448
+#, fuzzy
+msgid "Posting destination"
+msgstr "Açıklama yok"
+
+#: composer/e-msg-composer-select-file.c:274
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Bir dosya ekle"
+
+#: composer/e-msg-composer.c:514
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "PGP imza dosyası oluşturulamadı."
+
+#: composer/e-msg-composer.c:787
+#, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+"%s dosyasını yüklerken hata oldu:\n"
+"%s"
+
+#: composer/e-msg-composer.c:1160
+msgid "Warning!"
+msgstr "Uyarı!"
+
+#: composer/e-msg-composer.c:1164
+msgid "File exists, overwrite?"
+msgstr "Dosya var. Üzerine yazılsın mı?"
+
+#: composer/e-msg-composer.c:1187
+#, c-format
+msgid "Error saving file: %s"
+msgstr "%s dosyasını kaydederken hata oldu"
+
+#: composer/e-msg-composer.c:1207
+#, c-format
+msgid "Error loading file: %s"
+msgstr "`%s' dosyasını yüklerken hata oldu"
+
+#: composer/e-msg-composer.c:1240
+#, c-format
+msgid "Error accessing file: %s"
+msgstr "Dosyaya erişirken hata oldu: %s"
+
+#: composer/e-msg-composer.c:1248
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
+
+#: composer/e-msg-composer.c:1255
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Çıkış dosyası yaratılamadı: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1262
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Çıkış dosyası yaratılamadı: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1271
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"İletilerin kaydında hata: %s:\n"
+" %s"
+
+#: 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 ""
+"Evolution, önceki oturumlardan kaydedilmemiş dosyalar saptadı.\n"
+"Bunları kurtarmak istiyor musunuz?"
+
+#: 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 ileti gönderilmedi.\n"
+"Değişiklikleri kaydetmek istiyor musunuz?"
+
+#: composer/e-msg-composer.c:1536
+msgid "Warning: Modified Message"
+msgstr "Uyarı: İleti Değiştirildi"
+
+#: composer/e-msg-composer.c:1569
+msgid "Open file"
+msgstr "Dosyayı aç"
+
+#: composer/e-msg-composer.c:1927
+#, fuzzy
+msgid "Signature:"
+msgstr "İmza dosyası:"
+
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+msgid "Compose a message"
+msgstr "Bir ileti yaz"
+
+#: 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: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
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
+"e-posta bilgilerinizi girmediniz."
+
+#: composer/e-msg-composer.c:3858
+#, fuzzy
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>(Burada düzenlenmesi mümkün olmayan bir bilgi vardır.)<b>"
+
+#: composer/evolution-composer.c:393
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+"E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
+"e-posta bilgilerinizi girmediniz."
+
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
+msgstr "Evolution posta programı açılamadı."
+
+#: data/evolution.desktop.in.h:1
+msgid "The Evolution groupware suite"
+msgstr "Evolution kitlesel işlemler uygulaması"
+
+#: data/evolution.desktop.in.h:2
+msgid "Ximian Evolution"
+msgstr "Ximian Evolution"
+
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr "adres kartı"
+
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
+msgstr "takvim bilgisi"
+
+#: default_user/searches.xml.h:1
+msgid "Body contains"
+msgstr "Gövde içerir"
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr "Gövde içermez"
+
+#: default_user/searches.xml.h:3
+msgid "Body or subject contains"
+msgstr "Gövde ya da konu içerir"
+
+#: default_user/searches.xml.h:4
+msgid "Message contains"
+msgstr "İleti içerir"
+
+#: default_user/searches.xml.h:5
+msgid "Recipients contain"
+msgstr "Alıcılar içerir"
+
+#: default_user/searches.xml.h:6
+msgid "Sender contains"
+msgstr "Gönderen içerir"
+
+#: default_user/searches.xml.h:7
+msgid "Subject contains"
+msgstr "Konu içerir"
+
+#: default_user/searches.xml.h:8
+msgid "Subject does not contain"
+msgstr "Konu içermez"
+
+#: 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?"
+msgstr ""
+"Aynı isimde bir dosya zaten var\n"
+"Üzerine yazılsın mı?"
+
+#: e-util/e-passwords.c:363
+msgid "Remember this password"
+msgstr "Bu parolayı hatırla"
+
+#: e-util/e-passwords.c:365
+msgid "Remember this password for the remainder of this session"
+msgstr "Bu oturumun sonuna kadar girilen parolayı hatırla"
+
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Kategoriler"
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%d/%m/%Y %A %I:%M %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%d/%m/%Y %A %H:%M"
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:182
+msgid "%a %m/%d/%Y %I %p"
+msgstr "%d/%m/%Y %A %I %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:187
+msgid "%a %m/%d/%Y %H"
+msgstr "%d/%m/%Y %A %H"
+
+#. strptime format of a date and a time, in 12-hour format.
+#: e-util/e-time-utils.c:198
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr "%d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a date and a time, in 24-hour format.
+#: e-util/e-time-utils.c:202
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr "%d/%m/%Y %H:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:207
+msgid "%m/%d/%Y %I:%M %p"
+msgstr "%d/%m/%Y %I:%M %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:212
+msgid "%m/%d/%Y %H:%M"
+msgstr "%d/%m/%Y %H:%M"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:217
+msgid "%m/%d/%Y %I %p"
+msgstr "%d/%m/%Y %I %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:222
+msgid "%m/%d/%Y %H"
+msgstr "%d/%m/%Y %H"
+
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strptime format for hour and AM/PM, 12-hour format.
+#: e-util/e-time-utils.c:343
+msgid "%I %p"
+msgstr "%I %p"
+
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:186
+msgid "seconds"
+msgstr "saniye"
+
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "dakika"
+
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "saat"
+
+#: filter/filter-datespec.c:74
+msgid "week"
+msgstr "hafta"
+
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
+msgid "weeks"
+msgstr "hafta"
+
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "ay"
+
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "ay"
+
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "yılda bir güncelle"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "yılda bir güncelle"
+
+#: filter/filter-datespec.c:174
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Bir tarih seçmeyi unuttunuz."
+
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<bir tarih seçmek için tıklayınız>"
+
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+msgid "now"
+msgstr "şimdi"
+
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%d %b %a %Y"
+
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, c-format
+msgid "%d %s ago"
+msgstr ""
+
+#: filter/filter-datespec.c:407
+#, fuzzy
+msgid "Select a time to compare against"
+msgstr "Bir Zaman Dilimi Seçin"
+
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
+msgid "Filter Rules"
+msgstr "Filtre Kuralları"
+
+#: filter/filter-file.c:178
+msgid "You must specify a file name"
+msgstr ""
+
+#: filter/filter-file.c:190
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "`%s' normal bir dosya değildir."
+
+#: filter/filter-file.c:307
+#, fuzzy
+msgid "Choose a file"
+msgstr "Bir dosya aç"
+
+#. and now for the action area
+#: filter/filter-filter.c:513
+msgid "Then"
+msgstr "Sonra"
+
+#: filter/filter-filter.c:527
+msgid "Add action"
+msgstr "Eylem ekle"
+
+#: filter/filter-folder.c:149
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Bu vfolder adını değiştirmelisiniz."
+
+#: 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 "Dizini Seçin"
+
+#: filter/filter-input.c:200
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"`%s' düzgün deyiminde hata var:\n"
+"%s"
+
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
+#: mail/mail-config.glade.h:63
+msgid "Important"
+msgstr "Önemli"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:77
+#: mail/mail-config.glade.h:136
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:79
+#: mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Later"
+msgstr "sonra"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:223
+msgid "You must name this filter."
+msgstr "Bu filtrenin adını değiştirmelisiniz."
+
+#: filter/filter-rule.c:764
+msgid "Rule name: "
+msgstr "Kural adı:"
+
+#: filter/filter-rule.c:768
+msgid "Untitled"
+msgstr "İsimsiz"
+
+#: filter/filter-rule.c:785
+msgid "If"
+msgstr "Eğer"
+
+#: filter/filter-rule.c:803
+msgid "Execute actions"
+msgstr "Eylemleri işlet"
+
+#: filter/filter-rule.c:807
+msgid "if all criteria are met"
+msgstr "tüm kriterler sağlanırsa"
+
+#: filter/filter-rule.c:812
+msgid "if any criteria are met"
+msgstr "herhangi bir kriter sağlanırsa"
+
+#: filter/filter-rule.c:823
+msgid "Add criterion"
+msgstr "Sınıf ekle"
+
+#: filter/filter-rule.c:908
+msgid "incoming"
+msgstr "gelen"
+
+#: filter/filter-rule.c:908
+msgid "outgoing"
+msgstr "giden"
+
+#: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Karşılaştır"
+
+#: filter/filter.glade.h:2
+msgid "Edit Filters"
+msgstr "Filtreleri Düzenle"
+
+#: filter/filter.glade.h:3
+msgid "Edit VFolders"
+msgstr "VFolder Düzenle"
+
+#: filter/filter.glade.h:5
+msgid "Incoming"
+msgstr "Gelen"
+
+#: filter/filter.glade.h:6
+msgid "Outgoing"
+msgstr "Giden"
+
+#: filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Sanal Dizinler"
+
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "şimdiki zamana göreceli bir zaman"
+
+#: filter/filter.glade.h:19
+#, fuzzy
+msgid "ago"
+msgstr "Fargo"
+
+#: filter/filter.glade.h:25
+msgid "specific folders only"
+msgstr "sadece belirtilen dizinler"
+
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "şimdiki zaman"
+
+#: filter/filter.glade.h:27
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:28
+msgid "vFolder Sources"
+msgstr "vFolder Kaynakları"
+
+#: filter/filter.glade.h:30
+msgid "with all active remote folders"
+msgstr "tüm etkin uzak dizinlerle birlikte"
+
+#: filter/filter.glade.h:31
+msgid "with all local and active remote folders"
+msgstr "tüm yerel ve etkin uzak dizinlerle birlikte"
+
+#: filter/filter.glade.h:32
+msgid "with all local folders"
+msgstr "tüm yerel dizinlerle birlikte"
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Puan Belirt"
+
+#: filter/libfilter-i18n.h:3
+msgid "Assign Color"
+msgstr "Renk Belirle"
+
+#: filter/libfilter-i18n.h:4
+msgid "Assign Score"
+msgstr "Puan Belirt"
+
+#: filter/libfilter-i18n.h:5
+msgid "Attachments"
+msgstr "Ekler"
+
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
+
+#: filter/libfilter-i18n.h:7
+msgid "Copy to Folder"
+msgstr "Dizine Kopyala"
+
+#: filter/libfilter-i18n.h:8
+msgid "Date received"
+msgstr "Alınma tarihi"
+
+#: filter/libfilter-i18n.h:9
+msgid "Date sent"
+msgstr "Gönderilme tarihi"
+
+#: filter/libfilter-i18n.h:11
+msgid "Deleted"
+msgstr "Silinen"
+
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr "Bulunmaz"
+
+#: filter/libfilter-i18n.h:13
+msgid "Draft"
+msgstr "Taslak"
+
+#: filter/libfilter-i18n.h:14
+msgid "Exist"
+msgstr "bulunur"
+
+#: filter/libfilter-i18n.h:15
+msgid "Expression"
+msgstr "Deyim"
+
+#: filter/libfilter-i18n.h:16
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:19
+msgid "Mailing list"
+msgstr "E-posta listesi"
+
+#: filter/libfilter-i18n.h:20
+msgid "Message Body"
+msgstr "İleti Gövdesi"
+
+#: filter/libfilter-i18n.h:21
+msgid "Message Header"
+msgstr "İleti Başlığı"
+
+#: filter/libfilter-i18n.h:22
+msgid "Move to Folder"
+msgstr "Dizine Taşı"
+
+#: filter/libfilter-i18n.h:23
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Bağlantıya İleti Gönder"
+
+#: filter/libfilter-i18n.h:24
+#, fuzzy
+msgid "Play Sound"
+msgstr "Ses çal:"
+
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+msgid "Read"
+msgstr "Oku"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Alıcılar"
+
+#: filter/libfilter-i18n.h:27
+msgid "Regex Match"
+msgstr "Düzgün Deyim Eşleşimi"
+
+#: filter/libfilter-i18n.h:28
+msgid "Replied to"
+msgstr "Cevaplanan"
+
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puan"
+
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+msgid "Sender"
+msgstr "Gönderen"
+
+#: filter/libfilter-i18n.h:32
+msgid "Set Status"
+msgstr "Durum belirt"
+
+#: filter/libfilter-i18n.h:33
+#, fuzzy
+msgid "Shell Command"
+msgstr "Shelton"
+
+#: filter/libfilter-i18n.h:34
+msgid "Size (kB)"
+msgstr "Boyut (Kb)"
+
+#: filter/libfilter-i18n.h:35
+msgid "Source Account"
+msgstr "Kaynak Hesap"
+
+#: filter/libfilter-i18n.h:36
+msgid "Specific header"
+msgstr "Özel başlık"
+
+#: filter/libfilter-i18n.h:38
+msgid "Stop Processing"
+msgstr "İşlemeyi Durdur"
+
+#: 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 "Konu"
+
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Unset Status"
+msgstr "Durum belirt"
+
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "içerir"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "içermez"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "sonlanmaz"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "bulunmaz"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "bulunmaz"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "benzemez"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "başlamaz"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "biter"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "bulunur"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "İşaretli"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "sonra"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "önce"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "büyük"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "küçük"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "İşaretli"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "değil"
+
+#: filter/libfilter-i18n.h:57
+#, fuzzy
+msgid "is"
+msgstr "Nis"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "büyük"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "küçük"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "benzer"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "başlayan"
+
+#: filter/rule-editor.c:180
+msgid "Rules"
+msgstr "Görevler"
+
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
+msgid "Add Rule"
+msgstr "Görev Ekle"
+
+#: filter/rule-editor.c:388
+msgid "Edit Rule"
+msgstr "Görev Düzenle"
+
+#: filter/score-editor.c:130
+msgid "Score Rules"
+msgstr "Puan Kuralları"
+
+#: filter/vfolder-rule.c:206
+msgid "You must name this vfolder."
+msgstr "Bu vfolder adını değiştirmelisiniz."
+
+#: filter/vfolder-rule.c:215
+msgid "You need to to specify at least one folder as a source."
+msgstr "Kaynak için en az bir dizin belirtmelisiniz."
+
+#: importers/elm-importer.c:95
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution, eski Elm iletilerinizi alıyor"
+
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
+#: importers/pine-importer.c:101
+msgid "Importing..."
+msgstr "Alınıyor..."
+
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
+#: importers/pine-importer.c:103
+msgid "Please wait"
+msgstr "Lütfen bekleyiniz"
+
+#: 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 alınıyor.\n"
+"%s başlatılıyor"
+
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
+#: importers/pine-importer.c:471
+#, c-format
+msgid "Scanning %s"
+msgstr "%s taranıyor"
+
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:353
+msgid "Mail"
+msgstr "İleti"
+
+#: importers/elm-importer.c:545
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution, Elm ileti dosyaları buldu.\n"
+"Bunları Evolution'a aktarmak ister misiniz?"
+
+#: importers/elm-importer.c:574
+msgid "Elm"
+msgstr "Elm"
+
+#: importers/evolution-gnomecard-importer.c:246
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution, GnomeCard dosyaları buldu.\n"
+"Bunların Evolution'a aktarılmasını istiyor musunuz?"
+
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Öncelik: %s"
+
+#: importers/netscape-importer.c:653
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: importers/netscape-importer.c:677
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: importers/netscape-importer.c:694
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: importers/netscape-importer.c:1227
+msgid "Evolution is importing your old Netscape data"
+msgstr "Evolution, Netscape verilerini alıyor."
+
+#. Fill in the new fields
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
+#: shell/e-local-storage.c:183
+msgid "Trash"
+msgstr "Çöp"
+
+#: importers/netscape-importer.c:2028
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Yerel mektup dosyası %s"
+
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+msgid "Scanning directory"
+msgstr "Dizin taranıyor"
+
+#: importers/netscape-importer.c:2047
+msgid "Starting import"
+msgstr "Aktarma işlemi başlıyor"
+
+#: importers/netscape-importer.c:2133
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: importers/netscape-importer.c:2138
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Filtreleri Düzenle"
+
+#: importers/netscape-importer.c:2161
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution, Netscape e-posta dosyaları buldu.\n"
+"Bunların Evolution'a aktarılmasını istiyor musunuz?"
+
+#: importers/pine-importer.c:100
+msgid "Evolution is importing your old Pine data"
+msgstr "Evolution, Pine'daki tüm verileri alıyor"
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution, Pine e-posta dosyaları buldu.\n"
+"Bunların Evolution'a aktarılmasını istiyor musunuz?"
+
+#: importers/pine-importer.c:691
+msgid "Pine"
+msgstr "Pine"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Evolution e-posta programı mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Evolution e-posta programı mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Evolution e-posta programı mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Evolution e-posta programı mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Configure the fonts used by Evolution here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Posta hesaplarını ya da diğer tercihleri düzenle"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+msgid "Evolution component for handling mail."
+msgstr "E-posta alma va gönderme için Evolution bileşeni"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+msgid "Evolution mail composer."
+msgstr "Evolution e-posta programı."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+msgid "Evolution mail executive summary component."
+msgstr "Evolution e-posta özet bileşeni."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+msgid "Evolution mail folder display component."
+msgstr "Evolution e-posta dizin görüntüleme bileşeni."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
+msgid "Evolution mail folder factory component."
+msgstr "Evolution e-posta dizin bileşeni"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+msgid "Factory for the Evolution composer."
+msgstr "Evolution e-posta programı mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+msgid "Factory for the Mail Summary component."
+msgstr "E-posta özet bileşen mimarisi"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#, fuzzy
+msgid "Font Preferences"
+msgstr "_Tekrarlama yok"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Hesaplar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+msgid "Mail configuration interface"
+msgstr "İleti yapılandırma arayüzü"
+
+#: mail/component-factory.c:102
+msgid "Folder containing mail"
+msgstr "İletileri içeren dizin"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Genel"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "İletileri içeren dizin"
+
+#: mail/component-factory.c:104
+msgid "Virtual Trash"
+msgstr "Sanal Çöp"
+
+#: mail/component-factory.c:104
+msgid "Virtual Trash folder"
+msgstr "Sanal Çöp dizini"
+
+#: mail/component-factory.c:132
+msgid "This folder cannot contain messages."
+msgstr "Bu dizinde ileti bulunamaz."
+
+#: mail/component-factory.c:427
+msgid "Properties..."
+msgstr "Özellikler..."
+
+#: mail/component-factory.c:427
+msgid "Change this folder's properties"
+msgstr "Bu dizinin özelliklerini değiştir"
+
+#: 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:970
+msgid "You have not set a mail transport method"
+msgstr "Posta iletim yöntemi düzenlenmemiş"
+
+#: mail/component-factory.c:992
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Uyarı: İleti Değiştirildi"
+
+#: mail/component-factory.c:1040
+msgid "New Mail Message"
+msgstr "Yeni İleti"
+
+#: mail/component-factory.c:1040
+msgid "_Mail Message"
+msgstr "_İletiyi Gönder"
+
+#: mail/component-factory.c:1041
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Bir ileti yaz"
+
+#: mail/component-factory.c:1049
+#, fuzzy
+msgid "New Message Post"
+msgstr "Yeni İleti"
+
+#: mail/component-factory.c:1049
+#, fuzzy
+msgid "_Post Message"
+msgstr "İletiyi Yazdır"
+
+#: mail/component-factory.c:1050
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Yeni İleti"
+
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
+msgstr "Evolution'ın posta programı başlatılamadı."
+
+#: mail/component-factory.c:1087
+msgid "Cannot initialize Evolution's mail config component."
+msgstr "Evolution'ın ileti yapılandırma bileşeni başlatılamadı."
+
+#: mail/component-factory.c:1093
+msgid "Cannot initialize Evolution's folder info component."
+msgstr "Evolution'ın ileti dizin bilgi bileşeni başlatılamadı."
+
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#, fuzzy
+msgid "Connecting..."
+msgstr "Sunucuya bağlantı kuruluyor..."
+
+#: mail/component-factory.c:1366
+msgid "Cannot register storage with shell"
+msgstr "Depo kabuğa kayıt ettirilemedi"
+
+#: mail/folder-browser-ui.c:471
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" özellikleri"
+
+#: mail/folder-browser-ui.c:473
+msgid "Properties"
+msgstr "Özellikler"
+
+#: 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 "Geçici dizin yaratılamadı: %s"
+
+#: mail/folder-browser.c:764
+#, c-format
+msgid "%d new"
+msgstr "%d yeni"
+
+#: mail/folder-browser.c:767 mail/folder-browser.c:775
+#: mail/folder-browser.c:778
+msgid ", "
+msgstr ", "
+
+#: mail/folder-browser.c:769
+#, c-format
+msgid "%d hidden"
+msgstr "%d gizli"
+
+#: mail/folder-browser.c:771
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:776
+#, c-format
+msgid "%d selected"
+msgstr "%d seçili"
+
+#: mail/folder-browser.c:781
+#, c-format
+msgid "%d unsent"
+msgstr "%d gönderilmemiş"
+
+#: mail/folder-browser.c:783
+#, c-format
+msgid "%d sent"
+msgstr "%d gönderilmiş"
+
+#: mail/folder-browser.c:785
+#, c-format
+msgid "%d total"
+msgstr "toplam %d"
+
+#: mail/folder-browser.c:1113
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "İletiden _Sanal Dizin Yarat"
+
+#: mail/folder-browser.c:1693
+msgid "VFolder on _Subject"
+msgstr "_Konuya Göre VFolder"
+
+#: mail/folder-browser.c:1694
+msgid "VFolder on Se_nder"
+msgstr "_Gönderene Göre VFolder"
+
+#: mail/folder-browser.c:1695
+msgid "VFolder on _Recipients"
+msgstr "_Alıcılara Göre VFolder"
+
+#: mail/folder-browser.c:1696
+msgid "VFolder on Mailing _List"
+msgstr "_E-posta Listesi Üzerinde VFolder"
+
+#: mail/folder-browser.c:1700
+msgid "Filter on Sub_ject"
+msgstr "_Konuya Göre Filtrele"
+
+#: mail/folder-browser.c:1701
+msgid "Filter on Sen_der"
+msgstr "_Gönderene Göre Filtrele"
+
+#: mail/folder-browser.c:1702
+msgid "Filter on Re_cipients"
+msgstr "_Alıcılara Göre Filtrele"
+
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+msgid "Filter on _Mailing List"
+msgstr "_E-posta Listelerine Göre Filtrele"
+
+#: mail/folder-browser.c:1721
+msgid "_Edit as New Message..."
+msgstr "Yeni İleti Olarak _Düzenle..."
+
+#: mail/folder-browser.c:1723
+msgid "_Print"
+msgstr "_Yazdır"
+
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+msgid "_Reply to Sender"
+msgstr "_Gönderene Cevapla"
+
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _List"
+msgstr "_Listeye Cevapla"
+
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr "_Herkese Cevapla"
+
+#: mail/folder-browser.c:1730
+msgid "_Forward"
+msgstr "_Yönlendir"
+
+#: mail/folder-browser.c:1734
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1735
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Tamamlandı"
+
+#: mail/folder-browser.c:1736
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Temizle"
+
+#. separator here?
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+msgid "Mar_k as Read"
+msgstr "_Okunmuş Olarak İşaretle"
+
+#: mail/folder-browser.c:1741
+#, fuzzy
+msgid "Mark as _Unread"
+msgstr "Oku_nmamış Olarak İşaretle"
+
+#: mail/folder-browser.c:1742
+msgid "Mark as _Important"
+msgstr "Ö_nemli Olarak İşaretle"
+
+#: mail/folder-browser.c:1743
+#, fuzzy
+msgid "_Mark as Unimportant"
+msgstr "Ö_nemsiz Olarak İşaretle"
+
+#: mail/folder-browser.c:1748
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Silme"
+
+#: mail/folder-browser.c:1752
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "_Dizine Taşı..."
+
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "D_izine Kopyala..."
+
+#: mail/folder-browser.c:1761
+#, fuzzy
+msgid "Add Sender to Address_book"
+msgstr "Göndereni Adres Defterine Ekle"
+
+#: mail/folder-browser.c:1765
+#, fuzzy
+msgid "Appl_y Filters"
+msgstr "Filtreleri Uygula"
+
+#: mail/folder-browser.c:1769
+#, fuzzy
+msgid "Crea_te Rule From Message"
+msgstr "_Bu İletiden Bir Kural Yarat"
+
+#: mail/folder-browser.c:2027
+#, fuzzy
+msgid "VFolder on M_ailing List"
+msgstr "E-posta Listesi Üzerinde VFolder"
+
+#: mail/folder-browser.c:2029
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "E-posta Listesine Göre Filtrele (%s)"
+
+#: mail/folder-browser.c:2030
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "E-posta Listesi Üzerinde VFolder (%s)"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Öntanımlı"
+
+#: mail/folder-info.c:71
+msgid "Getting Folder Information"
+msgstr "Dizin Bilgisi Alınıyor"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr "Mbox dosyalarını Evolution'a aktarım mimarisi"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr "Mbox dosyalarını Evolution'a aktarır"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "Outlook Express 4 iletilerini Evolution'a aktarım mimarisi"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Outlook Express dosyalarını Evolution'a aktarır"
+
+#: mail/local-config.glade.h:1
+msgid "Current store format:"
+msgstr "Güncel depolama biçimi:"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Gövde içerir"
+
+#: mail/local-config.glade.h:3
+msgid "New store format:"
+msgstr "Yeni depolama biçimi:"
+
+#: mail/local-config.glade.h:4
+msgid ""
+"Note: When converting between mailbox formats, a failure\n"
+"(such as lack of disk space) may not be automatically\n"
+"recoverable.  Please use this feature with care."
+msgstr ""
+"Not: Farklı e-posta biçimleri arasında çeviri yaparken, \n"
+"diskin dolması gibi hatalarda veri kayıpları olabilir.\n"
+"Lütfen bu özelliği dikkatli kullanın."
+
+#: mail/local-config.glade.h:7
+msgid "maildir"
+msgstr "pdizini"
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr "pkutusu"
+
+#: mail/local-config.glade.h:9
+msgid "mh"
+msgstr "mh"
+
+#: mail/mail-account-editor.c:106
+msgid "You have not filled in all of the required information."
+msgstr "Gerekli tüm bilgiler verilmedi."
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:159
+msgid "Evolution Account Editor"
+msgstr "Evolution Hesap Düzenleyici"
+
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+msgid "_Host:"
+msgstr "_Makina:"
+
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#, fuzzy
+msgid "User_name:"
+msgstr "_Kullanıcı adı:"
+
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+msgid "_Path:"
+msgstr "_Yol:"
+
+#: mail/mail-account-gui.c:1847
+msgid "You may not create two accounts with the same name."
+msgstr "İki hesabı aynı isimlerle oluşturamazsınız."
+
+#: mail/mail-accounts.c:224
+msgid "Are you sure you want to delete this account?"
+msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
+
+#: mail/mail-accounts.c:228
+msgid "Don't delete"
+msgstr "Silme"
+
+#: mail/mail-accounts.c:231
+msgid "Really delete account?"
+msgstr "Gerçekten hesap silinsin mi?"
+
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
+msgid "Disable"
+msgstr "Kapat"
+
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
+msgid "Enable"
+msgstr "Etkinleştir"
+
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:54
+msgid "Enabled"
+msgstr "Etkin"
+
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "_Hesap adı:"
+
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Porto Riko"
+
+#: mail/mail-autofilter.c:78
+#, c-format
+msgid "Mail to %s"
+msgstr "%s adresine postala"
+
+#: mail/mail-autofilter.c:242
+#, c-format
+msgid "Subject is %s"
+msgstr "Konu: %s"
+
+#: mail/mail-autofilter.c:258
+#, c-format
+msgid "Mail from %s"
+msgstr "%s'ten E-posta"
+
+#: mail/mail-autofilter.c:275
+#, c-format
+msgid "%s mailing list"
+msgstr "%s posta listesi"
+
+#: mail/mail-autofilter.c:327
+msgid "Add Filter Rule"
+msgstr "Filtre Kuralı Ekle"
+
+#: mail/mail-autofilter.c:376
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:382
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:154
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Bir e-posta istemcisi yapılandırmadınız.\n"
+"Bu işlemi bir e-posta gönderip almadan\n"
+"önce yapmanız gerekiyor.\n"
+"Şimdi yapılandırmak istiyor musunuz?"
+
+#: mail/mail-callbacks.c:203
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"İleti göndermeden önce kendinize\n"
+"ait bir kimlik oluşturmalısınız."
+
+#: mail/mail-callbacks.c:217
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"İleti göndermeden önce bir posta\n"
+"iletim ayarı yapmalısınız."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+#, fuzzy
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"HTML biçimli bir ileti gönderiyorsunuz. Ancak aşağıdaki alıcılar, HTML "
+"biçimli iletiler almak istemiyorlar:\n"
+
+#: mail/mail-callbacks.c:270
+msgid "Send anyway?"
+msgstr "Yine de gönderilsin mi?"
+
+#: mail/mail-callbacks.c:312
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Bu iletinin konusu yok.\n"
+"Yine de gönderilsin mi?"
+
+#: mail/mail-callbacks.c:356
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:360
+msgid "This message contains only Bcc recipients."
+msgstr "Bu ileti sadece gizli (Bcc) alıcıları içeriyor."
+
+#: mail/mail-callbacks.c:364
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"E-posta sunucusu tüm alıcıları Apparently-to başlığı ekleyerek görünür hale "
+"getirebilir.\n"
+"Yine de göndereyim mi?"
+
+#: mail/mail-callbacks.c:513
+msgid "You must specify recipients in order to send this message."
+msgstr "Bu e-postayı göndermek için alıcısını belirtmeniz gereklidir."
+
+#: mail/mail-callbacks.c:777
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Bu hesap için taslak dizini açılamadı.\n"
+"Öntanımlı taslak dizinini kullanmak istiyor musunuz?"
+
+#: mail/mail-callbacks.c:1206
+msgid "an unknown sender"
+msgstr "bilinmeyen gönderici"
+
+#: mail/mail-callbacks.c:1210
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "%d-%m-%Y %A günü saat %H:%M sularında, %%s dedi ki:"
+
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "İletileri buraya taşı"
+
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "İleti(leri) buraya kopyala"
+
+#: mail/mail-callbacks.c:2380
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Gerçekten %d iletiyi düzenlemek istiyor musunuz?"
+
+#: mail/mail-callbacks.c:2405
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Sadece taslaklar dizinine kaydedilen\n"
+"iletileri düzenleyebilirsiniz."
+
+#: mail/mail-callbacks.c:2444
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Sadece Gönderilen dizinine kaydedilen\n"
+"iletileri yeniden gönderebilirsiniz."
+
+#: mail/mail-callbacks.c:2458
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Gerçekten %d iletiyi yeniden göndermek istiyor musunuz?"
+
+#: mail/mail-callbacks.c:2484
+msgid "No Message Selected"
+msgstr "Hiç İleti Seçilmedi"
+
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+msgid "Overwrite file?"
+msgstr "Dosya üzerine yazılsın mı?"
+
+#: mail/mail-callbacks.c:2583
+msgid "Save Message As..."
+msgstr "İletiyi Farklı Kaydet..."
+
+#: mail/mail-callbacks.c:2585
+msgid "Save Messages As..."
+msgstr "İletileri Farklı Kaydet..."
+
+#: mail/mail-callbacks.c:2654
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Sonraki okunmamış iletiyi göster"
+
+#: 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: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"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:3017
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Filtre bilgisini yüklerken hata oluştu:\n"
+"%s"
+
+#: mail/mail-callbacks.c:3029
+msgid "Filters"
+msgstr "Filtreler"
+
+#: mail/mail-callbacks.c:3073
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "%d/%d ileti alınıyor"
+
+#: mail/mail-callbacks.c:3128
+msgid "Print Message"
+msgstr "İletiyi Yazdır"
+
+#: mail/mail-callbacks.c:3155
+msgid "US-Letter"
+msgstr "Zarf"
+
+#: mail/mail-callbacks.c:3196
+msgid "Printing of message failed"
+msgstr "İletiyi yazdırılmasında hata"
+
+#: mail/mail-callbacks.c:3386
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Gerçekten %d iletiyi farklı pencerelerde açmak istiyor musunuz?"
+
+#: mail/mail-composer-prefs.c:223
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
+#, fuzzy
+msgid " [script]"
+msgstr "Açıklama yok"
+
+#: mail/mail-composer-prefs.c:306
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#, fuzzy
+msgid "Unnamed"
+msgstr "İsimsiz Bağlantı"
+
+#: mail/mail-composer-prefs.c:562
+#, fuzzy
+msgid "en"
+msgstr "Wien"
+
+#: mail/mail-composer-prefs.c:872
+#, fuzzy
+msgid "Add script signature"
+msgstr "Sınıf ekle"
+
+#: mail/mail-composer-prefs.c:873
+#, fuzzy
+msgid "Add Signature"
+msgstr "_HTML İmzası:"
+
+#: mail/mail-config-druid.c:146
+#, fuzzy
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Lütfen adınızı ve e-posta adresinizi aşağıdaki boşluğa yazın. Göndereceğiniz "
+"e-posta adresinizin içinde görünmesini \n"
+"istemiyorsanız seçimlik alanları doldurmanıza gerek yoktur. "
+
+#: mail/mail-config-druid.c:148
+#, fuzzy
+msgid ""
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Lütfen gelen e-posta sunucusu için bilgi verin. Eğer hangi tür bir sunucu "
+"kullandığınızı bilmiyorsanız sistem \n"
+" yöneticinize, ya da İnternet servis sağlayıcınıza başvurun."
+
+#: mail/mail-config-druid.c:150
+msgid "Please select among the following options"
+msgstr "Aşağıdaki seçeneklerden birisini seçin"
+
+#: mail/mail-config-druid.c:152
+#, fuzzy
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Lütfen giden e-posta sunucusu için protokol bilgisini aşağıda belirtin. Eğer "
+"hangi protokolü kullandığınızı \n"
+"bilmiyorsanız sistem yöneticinize, ya da İnternet servis sağlayıcınıza "
+"başvurun."
+
+#: mail/mail-config-druid.c:154
+#, fuzzy
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"E-posta yapılandırma işlemi neredeyse tamamlandı. Kimlik ayarlarınız, gelen "
+"ve giden e-posta \n"
+"sunucunuz Evolution hesabınızı tanımlamak için yeterli olacaktır. Lütfen \n"
+" aşağıdaki boşluğa bu hesap için bir ad veriniz. Bu isim, sadece \n"
+"görüntüleme amaçlı olarak kullanılacaktır."
+
+#. set window title
+#: mail/mail-config-druid.c:633
+msgid "Evolution Account Assistant"
+msgstr "Evolution Hesap Sihirbazı"
+
+#: mail/mail-config.c:636
+#, c-format
+msgid "Account %d"
+msgstr "Hesap %d"
+
+#: mail/mail-config.c:2660
+msgid "Checking Service"
+msgstr "Servis Denetleniyor"
+
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
+msgid "Connecting to server..."
+msgstr "Sunucuya bağlantı kuruluyor..."
+
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " "
+msgstr ", "
+
+#: mail/mail-config.glade.h:2
+msgid " _Check for supported types "
+msgstr "_Desteklenen türleri denetle "
+
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
+
+#: mail/mail-config.glade.h:4
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
+
+#: mail/mail-config.glade.h:5
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Account Editor"
+msgstr "Hesap %d"
+
+#: mail/mail-config.glade.h:8
+msgid "Account Information"
+msgstr "Hesap Bilgisi"
+
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Account Management"
+msgstr "Hesap Yöneticisi"
+
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Sınıf ekle"
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Add new signature..."
+msgstr "İmzayı kaydet"
+
+#: mail/mail-config.glade.h:12
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
+msgstr "B_u hesabı kullanırken giden iletileri her zaman imzala"
+
+#: mail/mail-config.glade.h:16
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:17
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Attach original message"
+msgstr "İletiyi bir dosya ekle"
+
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Ek"
+
+#: mail/mail-config.glade.h:21
+msgid "Authentication"
+msgstr "Kimlik Denetimi"
+
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Yeni iletileri otomatik denetle:"
+
+#: mail/mail-config.glade.h:23
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Bilinmeyen karakter seti: %s"
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_olors"
+msgstr "_Kapat"
+
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr "Yeni İletiler Denetleniyor"
+
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Bugün tamamlanması gereken görevlerin rengi"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Bir ileti yaz"
+
+#: mail/mail-config.glade.h:31
+msgid "Configuration"
+msgstr "Yapılandırma"
+
+#: mail/mail-config.glade.h:32
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Finish\" to save your settings."
+msgstr ""
+"Tebrikler, e-posta ayarları başarıyla tamamlandı.\n"
+"\n"
+"Şimdi Evolution kullanarak iletilerinizi alabilir \n"
+"ve gönderebilirsiniz.\n"
+"\n"
+"Ayarlarınızı kaydetmek için \"Bitiş\" düğmesine tıklayın."
+
+#: mail/mail-config.glade.h:38
+msgid "De_fault"
+msgstr "Ö_ntanımlı"
+
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Del Bajio"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Default character _encoding:"
+msgstr "Ö_ntanımlı karakter kümesi: "
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "İleti Alınıyor"
+
+#: mail/mail-config.glade.h:44
+msgid "Digital IDs..."
+msgstr "Sayısal Numaralar..."
+
+#: mail/mail-config.glade.h:45
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "İleti açılamadı"
+
+#: mail/mail-config.glade.h:46
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
+msgstr ""
+
+#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+msgid "Done"
+msgstr "Tamamlandı"
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Taslaklar dizini:"
+
+#: mail/mail-config.glade.h:49
+msgid "E_nable"
+msgstr "_Etkinleştir"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Emacs"
+msgstr "Doğu"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Hesaplar"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Email _address:"
+msgstr "_E-posta adresi:"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Çı_karken çöp dizinini sil"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Eylemleri işlet"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "biter"
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Font Properties"
+msgstr "Özellikler"
+
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Yönlendirilmiş iletiler"
+
+#: mail/mail-config.glade.h:59
+msgid "Get Digital ID..."
+msgstr "Sayısal Numarayı Al..."
+
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Referansları "
+
+#: mail/mail-config.glade.h:61
+msgid "IMAPv4 "
+msgstr "IMAPv4 "
+
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+msgid "Identity"
+msgstr "Kimlik"
+
+#: mail/mail-config.glade.h:64
+msgid "Inline"
+msgstr "Bağlantılı"
+
+#: mail/mail-config.glade.h:65
+msgid "Kerberos "
+msgstr "Kerberos "
+
+#: mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Kaydet ve Kapat"
+
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Loading Images"
+msgstr "Resimleri _Yükle"
+
+#: mail/mail-config.glade.h:69
+msgid "Mail Configuration"
+msgstr "İleti Yapılandırması"
+
+#: mail/mail-config.glade.h:71
+msgid "Mailbox location"
+msgstr "Posta Kutusu konumu"
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "İletiler"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "İleti _Görünümü"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronezya"
+
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "İleti Yapılandırması"
+
+#: mail/mail-config.glade.h:79
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:80
+msgid "Optional Information"
+msgstr "Seçimlik Bilgi"
+
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "_Kurum:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
+msgstr "PGP _Anahtar Numarası:"
+
+#: mail/mail-config.glade.h:87
+msgid "Pick a color"
+msgstr "Bir renk seçin"
+
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "Sadece _Bcc alıcıların tanımlı olduğu iletileri gönderirken beni uyar"
+
+#: mail/mail-config.glade.h:89
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy"
+
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Seçili bağlantıları yazdır"
+
+#: mail/mail-config.glade.h:91
+msgid "Qmail maildir "
+msgstr "Qmail dizini "
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "İleti açılamadı"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "Quoted"
+msgstr "Not"
+
+#: mail/mail-config.glade.h:94
+msgid "Re_member this password"
+msgstr "_Bu parolayı hatırla"
+
+#: mail/mail-config.glade.h:95
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Cevapla:"
+
+#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
+msgstr "İletiler Alınıyor"
+
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Receiving _Options"
+msgstr "Alma Seçenekleri"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Bu parolayı hatırla"
+
+#: mail/mail-config.glade.h:99
+msgid "Required Information"
+msgstr "İstenen Bilgiler"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Öntanımlı"
+
+#: mail/mail-config.glade.h:102
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Güvenlik"
+
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "Secure MIME (S/MIME)"
+msgstr "Güvenli MIME"
+
+#: mail/mail-config.glade.h:104
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:105
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:106
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Select PGP program"
+msgstr "PGP programını seçin"
+
+#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "İleti Gönderiliyor"
+
+#: mail/mail-config.glade.h:111
+msgid "Sent _messages folder:"
+msgstr "_Gönderilen iletiler dizini:"
+
+#: mail/mail-config.glade.h:112
+msgid "Sent and Draft Messages"
+msgstr "Gönderilen ve Taslak İletileri"
+
+#: mail/mail-config.glade.h:113
+msgid "Ser_ver requires authentication"
+msgstr "S_unucu kimlik denetimi istiyor"
+
+#: mail/mail-config.glade.h:114
+msgid "Server Configuration"
+msgstr "Sunucu Yapılandırması"
+
+#: mail/mail-config.glade.h:115
+msgid "Server _Type: "
+msgstr "Su_nucu Türü: "
+
+#: mail/mail-config.glade.h:116
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Kısayollar"
+
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Signature #1"
+msgstr "İmza dosyası:"
+
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Signature #2"
+msgstr "İmza dosyası:"
+
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Stil adı:"
+
+#: mail/mail-config.glade.h:120
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:121
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:122
+msgid "Standard Unix mbox"
+msgstr "Standart UNIX posta kutusu dosyası"
+
+#: mail/mail-config.glade.h:123
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:126
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:128
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+
+#: mail/mail-config.glade.h:131
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Değişken"
+
+#: mail/mail-config.glade.h:132
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+"Evolution E-posta Yapılandırma Sihirbazına Hoşgeldiniz.\n"
+"\n"
+"Devam etmek için \"İleri\" düğmesine tıklayın."
+
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "XEmacs"
+msgstr "Doğu"
+
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_HTML İmzası:"
+
+#: mail/mail-config.glade.h:140
+msgid "_Always load images off the net"
+msgstr "_Resimleri her zaman ağdan indir"
+
+#: mail/mail-config.glade.h:141
+msgid "_Always sign outgoing messages when using this account"
+msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
+
+#: mail/mail-config.glade.h:142
+msgid "_Authentication Type: "
+msgstr "_Kimlik Denetim Türü: "
+
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Kimlik Denetim Türü: "
+
+#: mail/mail-config.glade.h:144
+msgid "_Automatically check for new mail"
+msgstr "_Yeni iletileri otomatik denetle:"
+
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Yeni iletileri otomatik denetle:"
+
+#: mail/mail-config.glade.h:146
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:147
+msgid "_Certificate ID:"
+msgstr "_Sertifika No:"
+
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Bir dizini silmeden önce onayla"
+
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Default signature:"
+msgstr "İmza dışında tümünü sil"
+
+#: mail/mail-config.glade.h:150
+#, fuzzy
+msgid "_Defaults"
+msgstr "Öntanımlı"
+
+#: mail/mail-config.glade.h:152
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Enable"
+msgstr "Etkinleştir"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Farklı Yönlendir"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
+msgstr "_Tam isim:"
+
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "HTML İleti İçinde"
+
+#: mail/mail-config.glade.h:161
+#, fuzzy
+msgid "_Identity"
+msgstr "Kimlik"
+
+#: mail/mail-config.glade.h:162
+msgid "_Load images if sender is in addressbook"
+msgstr "_Gönderici adres defterinde ise resimleri yükle"
+
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "_Bunu öntanımlı hesabım yap"
+
+#: mail/mail-config.glade.h:164
+#, fuzzy
+msgid "_Mark messages as read after"
+msgstr "İletileri"
+
+#: mail/mail-config.glade.h:165
+msgid "_Name:"
+msgstr "İ_sim:"
+
+#: mail/mail-config.glade.h:166
+msgid "_Never load images off the net"
+msgstr "R_esimleri hiç bir zaman ağdan indirme"
+
+#: mail/mail-config.glade.h:167
+msgid "_PGP binary path:"
+msgstr "_PGP ikili program yolu:"
+
+#: mail/mail-config.glade.h:169
+msgid "_Play sound file when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:170
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "HTML iletileri istemeyen bağlantılara ileti gönderirken beni _uyar"
+
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "İ_letileri konusuz gönderirken beni uyar"
+
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "İletiler Alınıyor"
+
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Herkese cevapla"
+
+#: mail/mail-config.glade.h:174
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Script:"
+msgstr "_Güvenlik"
+
+#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Güvenlik"
+
+#: mail/mail-config.glade.h:177
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "İleti Gönderiliyor"
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Zamanı Farklı Göster"
+
+#: mail/mail-config.glade.h:179
+#, fuzzy
+msgid "_Signatures"
+msgstr "İmza _dosyası:"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "_Güvenli bağlantı (SSL) kullan"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Değişken"
+
+#: mail/mail-config.glade.h:182
+msgid "_every"
+msgstr "_her"
+
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "color"
+msgstr " rengi ile göster"
+
+#: mail/mail-config.glade.h:184
+msgid "description"
+msgstr "açıklama"
+
+#: mail/mail-config.glade.h:187
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
+
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "S/MIME imzası oluşturulamadı."
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr "S/MIME şifreli içerik (sadece serifikalı) oluşturulamıyor."
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "S/MIME şifreli içerik oluşturulamıyor."
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr "S/MIME şifreli zarf içeriği oluşturulamıyor."
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "S/MIME kodlama içeriği oluşturulamıyor."
+
+#: mail/mail-display.c:321
+msgid "Save Attachment"
+msgstr "Eki Kaydet"
+
+#: mail/mail-display.c:386
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Geçici dizin yaratılamadı: %s"
+
+#: mail/mail-display.c:432
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Eki Kaydet"
+
+#: mail/mail-display.c:433
+msgid "View Inline"
+msgstr "İzle"
+
+#: mail/mail-display.c:434
+#, c-format
+msgid "Open in %s..."
+msgstr "%s içinde aç..."
+
+#: mail/mail-display.c:494
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "İzle (%s kullanarak)"
+
+#: mail/mail-display.c:498
+msgid "Hide"
+msgstr "Gizle"
+
+#: mail/mail-display.c:519
+msgid "External Viewer"
+msgstr "Harici İzleyici"
+
+#: mail/mail-display.c:1319
+#, fuzzy
+msgid "Downloading images"
+msgstr "İletiler taşınıyor"
+
+#: mail/mail-display.c:1494
+msgid "Loading message content"
+msgstr "İleti içeriği yükleniyor"
+
+#: mail/mail-display.c:1781
+#, fuzzy
+msgid "Overdue:"
+msgstr "_Zamanı geçen görevler:"
+
+#: mail/mail-display.c:1785
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %l:%M %p"
+
+#: mail/mail-display.c:2112
+msgid "Open Link in Browser"
+msgstr "Bağlantıyı Tarayıcıda Aç"
+
+#: mail/mail-display.c:2113
+msgid "Copy Link Location"
+msgstr "Adresi Kopyala"
+
+#: mail/mail-display.c:2115
+msgid "Save Link as (FIXME)"
+msgstr "Bağlantıyı Farklı Kaydet"
+
+#: mail/mail-display.c:2117
+msgid "Save Image as..."
+msgstr "Resmi Farklı Kaydet..."
+
+#: mail/mail-folder-cache.c:743
+#, fuzzy, c-format
+msgid "Pinging %s"
+msgstr "%s taranıyor"
+
+#: mail/mail-format.c:650
+#, c-format
+msgid "%s attachment"
+msgstr "%s ek"
+
+#: mail/mail-format.c:696
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
+
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Tarih"
+
+#: mail/mail-format.c:867
+msgid "Bad Address"
+msgstr "Hatalı Adres"
+
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
+msgid "From"
+msgstr "Gönderen"
+
+#: mail/mail-format.c:914
+msgid "Reply-To"
+msgstr "Yanıtla:"
+
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Alıcı"
+
+#: mail/mail-format.c:924
+msgid "Cc"
+msgstr "Bilgi"
+
+#: mail/mail-format.c:929
+msgid "Bcc"
+msgstr "Gizli"
+
+#: mail/mail-format.c:960
+#, fuzzy
+msgid "Mailer"
+msgstr "İleti"
+
+#: mail/mail-format.c:1834
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Bu ileti dijital olarak imzalanmıştır ve güvenlidir. Daha fazla bilgi için "
+"kilit simgesi üzerine tıklayın."
+
+#: mail/mail-format.c:1861
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "PGP onaylama dosyası oluşturulamadı."
+
+#: mail/mail-format.c:1870
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Bu ileti dijital olarak imzalanmıştır ve güvenlidir."
+
+#: mail/mail-format.c:1878
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
+
+#: mail/mail-format.c:2128
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP adresine bağ (%s)"
+
+#: mail/mail-format.c:2142
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "%s yerel dosyasına bağ (\"%s\" adresinde geçerli)"
+
+#: mail/mail-format.c:2147
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Yerel dosyaya bağ (%s)"
+
+#: mail/mail-format.c:2176
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "FTP adresine bağ (%s)"
+
+#: mail/mail-format.c:2184
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
+
+#: mail/mail-format.c:2189
+msgid "Malformed external-body part."
+msgstr "Bozuk harici gövde"
+
+#: mail/mail-local.c:539 mail/mail-local.c:541
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Yerel Dizinler"
+
+#: mail/mail-local.c:671
+msgid "Reconfiguring folder"
+msgstr "Dizin yeniden yapılandırılıyor"
+
+#: 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:808
+#, fuzzy, c-format
+msgid "Cannot save folder metainfo to %s: %s"
+msgstr "%s üzerinde dizin kilitlemesi yaratılamadı: %s"
+
+#: mail/mail-local.c:860
+#, fuzzy, c-format
+msgid "Cannot delete folder metadata %s: %s"
+msgstr ""
+"Dizin silinemedi:\n"
+"%s"
+
+#: mail/mail-local.c:1329
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr "\"%s\" biçiminden \"%s\" biçimine geçiliyor"
+
+#: mail/mail-local.c:1351
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+"Eğer bu dizini tekrar açamazsınız, elle \n"
+"düzeltme yapmak zorunda kalacaksınız."
+
+#: mail/mail-local.c:1446
+#, c-format
+msgid "Reconfigure /%s"
+msgstr "Yeniden Yapılandır/%s"
+
+#: mail/mail-local.c:1510
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Bu çöp dizininden ileti kopyalayamazsınız."
+
+#: mail/mail-mt.c:257
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"'%s' sırasında hata:\n"
+"%s"
+
+#: mail/mail-mt.c:260
+#, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"İşlem sırasında hata:\n"
+"%s"
+
+#: mail/mail-mt.c:904
+msgid "Working"
+msgstr "Çalışıyor"
+
+#: mail/mail-ops.c:89
+msgid "Filtering Folder"
+msgstr "Dizin filtreleniyor"
+
+#: mail/mail-ops.c:267
+msgid "Fetching Mail"
+msgstr "İleti Alınıyor"
+
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
+msgid "However, the message was successfully sent."
+msgstr ""
+
+#: mail/mail-ops.c:618
+#, c-format
+msgid "Sending \"%s\""
+msgstr "\"%s\" gönderiliyor"
+
+#: mail/mail-ops.c:738
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "%d / %d ileti gönderiliyor"
+
+#: mail/mail-ops.c:757
+#, c-format
+msgid "Failed on message %d of %d"
+msgstr "%d/%d iletide hata"
+
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+msgid "Complete."
+msgstr "Tamamlandı."
+
+#: mail/mail-ops.c:853
+msgid "Saving message to folder"
+msgstr "İletiler dizine kaydediliyor"
+
+#: mail/mail-ops.c:934
+#, c-format
+msgid "Moving messages to %s"
+msgstr "İletiler %s'e taşınıyor"
+
+#: mail/mail-ops.c:934
+#, c-format
+msgid "Copying messages to %s"
+msgstr "İletiler %s'e kopyalanıyor"
+
+#: mail/mail-ops.c:1051
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "\"%s\" içinde dizinler taranıyor"
+
+#: mail/mail-ops.c:1234
+msgid "Forwarded messages"
+msgstr "Yönlendirilmiş iletiler"
+
+#: mail/mail-ops.c:1277
+#, c-format
+msgid "Opening folder %s"
+msgstr "%s dizini açılıyor"
+
+#: mail/mail-ops.c:1349
+#, c-format
+msgid "Opening store %s"
+msgstr "%s deposu açılıyor"
+
+#: mail/mail-ops.c:1422
+#, c-format
+msgid "Removing folder %s"
+msgstr "%s dizini siliniyor"
+
+#: mail/mail-ops.c:1516
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "'%s' dizinine kaydediliyor"
+
+#: mail/mail-ops.c:1567
+msgid "Refreshing folder"
+msgstr "Dizin tazeleniyor"
+
+#: mail/mail-ops.c:1603
+msgid "Expunging folder"
+msgstr "Dizin siliniyor"
+
+#: mail/mail-ops.c:1652
+#, c-format
+msgid "Retrieving message %s"
+msgstr "%s numaralı ileti alınıyor"
+
+#: mail/mail-ops.c:1724
+#, c-format
+msgid "Retrieving %d message(s)"
+msgstr "%d ileti alınıyor"
+
+#: mail/mail-ops.c:1810
+#, c-format
+msgid "Saving %d messsage(s)"
+msgstr "%d ileti kaydediliyor"
+
+#: mail/mail-ops.c:1922
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Çıkış dosyası yaratılamadı: %s\n"
+" %s"
+
+#: mail/mail-ops.c:1950
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+"İletilerin kaydında hata: %s:\n"
+" %s"
+
+#: mail/mail-ops.c:2024
+msgid "Saving attachment"
+msgstr "Ek kaydediliyor"
+
+#: mail/mail-ops.c:2041
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+"Çıkış dosyası yaratılamadı: %s:\n"
+" %s"
+
+#: mail/mail-ops.c:2071
+#, c-format
+msgid "Could not write data: %s"
+msgstr "Veri yazılamadı: %s."
+
+#: mail/mail-ops.c:2219
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "%s bağlantısı kesiliyor"
+
+#: mail/mail-ops.c:2219
+#, c-format
+msgid "Reconnecting to %s"
+msgstr "%s adresine bağlantı kuruluyor"
+
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+msgid "_Search"
+msgstr "_Ara"
+
+#: mail/mail-search.c:137
+msgid "(Untitled Message)"
+msgstr "(Başlıksız İleti)"
+
+#: mail/mail-search.c:240
+msgid "Untitled Message"
+msgstr "Başlıksız İleti"
+
+#: mail/mail-search.c:244
+msgid "Empty Message"
+msgstr "Boş İleti"
+
+#: mail/mail-search.c:291
+msgid "Find in Message"
+msgstr "İletide Bul"
+
+#: mail/mail-search.c:321
+msgid "Case Sensitive"
+msgstr "Küçük/büyük Harfe Duyarlı"
+
+#: mail/mail-search.c:323
+msgid "Search Forward"
+msgstr "İleri Doğru Arat"
+
+#: mail/mail-search.c:343
+msgid "Find:"
+msgstr "Bul:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Eşleşenler:"
+
+#: mail/mail-send-recv.c:141
+msgid "Cancelling..."
+msgstr "İptal ediliyor..."
+
+#: mail/mail-send-recv.c:246
+#, c-format
+msgid "Server: %s, Type: %s"
+msgstr "Sunucu: %s, Tür: %s"
+
+#: mail/mail-send-recv.c:248
+#, c-format
+msgid "Path: %s, Type: %s"
+msgstr "Yol: %s, Tür: %s"
+
+#: mail/mail-send-recv.c:250
+#, c-format
+msgid "Type: %s"
+msgstr "Tür: %s"
+
+#: mail/mail-send-recv.c:293
+msgid "Send & Receive Mail"
+msgstr "İletileri Al ve Gönder"
+
+#: mail/mail-send-recv.c:295
+msgid "Cancel All"
+msgstr "Hepsini İptal Et"
+
+#: mail/mail-send-recv.c:355
+msgid "Updating..."
+msgstr "Güncelleniyor..."
+
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+msgid "Waiting..."
+msgstr "Bekleniyor..."
+
+#: mail/mail-session.c:221
+msgid "User canceled operation."
+msgstr "Kullanıcı işlemi iptal etti."
+
+#: mail/mail-session.c:272
+msgid "_Remember this password"
+msgstr "_Bu parolayı hatırla"
+
+#: mail/mail-session.c:273
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Bu oturumun sonuna kadar girilen parolayı hatırla"
+
+#: mail/mail-session.c:330
+#, c-format
+msgid "Enter Password for %s"
+msgstr "%s İçin Parolayı Girin"
+
+#: mail/mail-session.c:333
+msgid "Enter Password"
+msgstr "Parolayı Girin"
+
+#: mail/mail-signature-editor.c:81
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "İmza dosyası kaydedilemedi."
+
+#: mail/mail-signature-editor.c:175
+msgid "Save signature"
+msgstr "İmzayı kaydet"
+
+#: 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 ""
+"Bu ileti değiştirildi, ancak kaydedilmedi.\n"
+"\n"
+"Değişiklikleri kaydetmek istiyor musunuz?"
+
+#: mail/mail-signature-editor.c:372
+msgid "Enter a name for this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "İsim:"
+
+#: mail/mail-tools.c:262
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "Yönlendirilmiş ileti - %s"
+
+#: mail/mail-tools.c:266
+msgid "Forwarded message"
+msgstr "Yönlendirilmiş ileti"
+
+#: mail/mail-tools.c:408
+msgid "Forwarded Message"
+msgstr "Yönlendirilmiş İleti"
+
+#: mail/mail-vfolder.c:84
+#, c-format
+msgid "Setting up vfolder: %s"
+msgstr "VDizin yaratılıyor: %s"
+
+#: mail/mail-vfolder.c:202
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "\"%s\" içinde dizinler taranıyor"
+
+#: mail/mail-vfolder.c:447
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+msgid "VFolders"
+msgstr "VDizin"
+
+#: mail/mail-vfolder.c:819
+msgid "vFolders"
+msgstr "vDizinler"
+
+#: mail/mail-vfolder.c:861
+msgid "Edit VFolder"
+msgstr "VDizin Düzenle"
+
+#: mail/mail-vfolder.c:877
+#, c-format
+msgid "Trying to edit a vfolder '%s' which doesn't exist."
+msgstr ""
+
+#: mail/mail-vfolder.c:931
+msgid "New VFolder"
+msgstr "Yeni VDizin"
+
+#: mail/message-browser.c:210
+msgid "(No subject)"
+msgstr "(Konusuz)"
+
+#: mail/message-browser.c:212
+#, c-format
+msgid "%s - Message"
+msgstr "%s - İleti"
+
+#: mail/message-list.c:736
+msgid "Unseen"
+msgstr "Görünmeyen"
+
+#: mail/message-list.c:737
+msgid "Seen"
+msgstr "Görünen"
+
+#: mail/message-list.c:738
+msgid "Answered"
+msgstr "Cevaplanan"
+
+#: mail/message-list.c:739
+msgid "Multiple Unseen Messages"
+msgstr "Çoklu Görülmeyen İleti"
+
+#: mail/message-list.c:740
+msgid "Multiple Messages"
+msgstr "Çoklu İletiler"
+
+#: mail/message-list.c:744
+msgid "Lowest"
+msgstr "En Düşük"
+
+#: mail/message-list.c:745
+msgid "Lower"
+msgstr "Düşük"
+
+#: mail/message-list.c:749
+msgid "Higher"
+msgstr "Yüksek"
+
+#: mail/message-list.c:750
+msgid "Highest"
+msgstr "En Yüksek"
+
+#: mail/message-list.c:1066
+msgid "?"
+msgstr "?"
+
+#: mail/message-list.c:1073
+msgid "Today %l:%M %p"
+msgstr "Bugün %l:%M %p"
+
+#: mail/message-list.c:1082
+msgid "Yesterday %l:%M %p"
+msgstr "Dün %l:%M %p"
+
+#: mail/message-list.c:1094
+msgid "%a %l:%M %p"
+msgstr "%a %l %M %p"
+
+#: mail/message-list.c:1102
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: mail/message-list.c:1104
+msgid "%b %d %Y"
+msgstr "%d %b %Y"
+
+#: mail/message-list.c:2568
+msgid "Generating message list"
+msgstr "İleti listesi oluşturuluyor"
+
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Tarihe göre "
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Durum"
+
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr "İşaretli"
+
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Asıl Bağlantı:"
+
+#: mail/message-list.etspec.h:9
+msgid "Received"
+msgstr "Alındı"
+
+#: mail/message-list.etspec.h:11
+msgid "Size"
+msgstr "Boyut"
+
+#: mail/message-tag-followup.c:54
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:55
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "İleri git"
+
+#: mail/message-tag-followup.c:56
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "For Your Information"
+msgstr "Kaynak Bilgisi"
+
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Yönlendir"
+
+#: mail/message-tag-followup.c:59
+msgid "No Response Necessary"
+msgstr ""
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+msgid "Reply"
+msgstr "Cevapla"
+
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+msgid "Reply to All"
+msgstr "Herkese cevapla"
+
+#: mail/message-tag-followup.c:63
+#, fuzzy
+msgid "Review"
+msgstr "Önizleme"
+
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Tamamlandı"
+
+#: 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 "Temizle"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "_Tarihe Göre:"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "İşaretli"
+
+#: mail/subscribe-dialog.c:229
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "\"%s\" içinde dizinler taranıyor"
+
+#: mail/subscribe-dialog.c:231
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "\"%s\" içinde dizinler taranıyor"
+
+#: mail/subscribe-dialog.c:334
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "\"%s\" dizinine üye olunuyor"
+
+#: mail/subscribe-dialog.c:336
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "\"%s\" dizininden üyelik siliniyor"
+
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Dizin"
+
+#: mail/subscribe-dialog.c:1443
+#, fuzzy
+msgid "Scanning folders..."
+msgstr "Dizine kaydet..."
+
+#: mail/subscribe-dialog.c:1550
+msgid "No server has been selected"
+msgstr "Hiç sunucu seçilmedi"
+
+#: mail/subscribe-dialog.c:1614
+msgid "Please select a server."
+msgstr "Lütfen bir sunucu seçiniz."
+
+#: mail/subscribe-dialog.glade.h:1
+msgid "All folders"
+msgstr "Tüm dizinler"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "Apri file"
+msgstr "Nisan"
+
+#: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
+#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:5
+msgid "Close"
+msgstr "Kapat"
+
+#: mail/subscribe-dialog.glade.h:4
+#, fuzzy
+msgid "Display Options"
+msgstr "Görüntüleme seçenekleri"
+
+#: mail/subscribe-dialog.glade.h:5
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:6
+msgid "Manage Subscriptions"
+msgstr "Üyelikleri Düzenle"
+
+#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr "Listeyi Tazele"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "S_elect server: "
+msgstr "Dizini Seçin"
+
+#: mail/subscribe-dialog.glade.h:9
+#, fuzzy
+msgid "Salve file"
+msgstr "Bir dosya seçin"
+
+#: mail/subscribe-dialog.glade.h:10
+msgid "_Subscribe"
+msgstr "_Üye ol"
+
+#: mail/subscribe-dialog.glade.h:11
+msgid "_Unsubscribe"
+msgstr "Ü_yelikten çık"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Evolution Özeti içeren dizin"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Configure the appearance of the Evolution Summary here"
+msgstr "Evolution Özeti içeren dizin"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolution e-posta programı."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "E-posta özet bileşen mimarisi"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "E-posta özet bileşen mimarisi"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Özet Ayarları"
+
+#: my-evolution/Locations.h:1
+msgid "Aarhus"
+msgstr "Aarhus"
+
+#: my-evolution/Locations.h:2
+msgid "Abakan"
+msgstr "Abakan"
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr "Abbotsford"
+
+#: my-evolution/Locations.h:4
+msgid "Aberdeen"
+msgstr "Aberdeen"
+
+#: my-evolution/Locations.h:5
+msgid "Abha"
+msgstr "Abha"
+
+#: my-evolution/Locations.h:6
+msgid "Abilene"
+msgstr "Abilene"
+
+#: my-evolution/Locations.h:7
+msgid "Abingdon"
+msgstr "Abingdon"
+
+#: my-evolution/Locations.h:8
+msgid "Abu Dhabi"
+msgstr "Abu Dhabi"
+
+#: my-evolution/Locations.h:9
+msgid "Abu Dhabi - Bateen"
+msgstr "Abu Dhabi - Bateen"
+
+#: my-evolution/Locations.h:10
+msgid "Acajutla"
+msgstr "Acajutla"
+
+#: my-evolution/Locations.h:11
+msgid "Acapulco"
+msgstr "Acapulco"
+
+#: my-evolution/Locations.h:12
+msgid "Acarigua"
+msgstr "Acarigua"
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr "Adak"
+
+#: my-evolution/Locations.h:14
+msgid "Adana"
+msgstr "Adana"
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr "Adana/İncirlik"
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr "Adelaide"
+
+#: my-evolution/Locations.h:17
+msgid "Aden"
+msgstr "Aden"
+
+#: my-evolution/Locations.h:18
+msgid "Adrar"
+msgstr "Adrar"
+
+#: my-evolution/Locations.h:19
+msgid "Aeroparque"
+msgstr "Aeroparque"
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr "Aeropuerto del Norte"
+
+#: my-evolution/Locations.h:21
+msgid "Afonsos"
+msgstr "Afonsos"
+
+#: my-evolution/Locations.h:22
+msgid "Africa"
+msgstr "Afrika"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr "Afyon"
+
+#: my-evolution/Locations.h:24
+msgid "Agen"
+msgstr "Agen"
+
+#: my-evolution/Locations.h:25
+msgid "Aguascaliantes"
+msgstr "Aguascaliantes"
+
+#: my-evolution/Locations.h:26
+msgid "Ahmadabad"
+msgstr "Ahmadabad"
+
+#: my-evolution/Locations.h:27
+msgid "Ahwaz"
+msgstr "Ahwaz"
+
+#: my-evolution/Locations.h:28
+msgid "Ainsworth"
+msgstr "Ainsworth"
+
+#: my-evolution/Locations.h:29
+msgid "Air Force"
+msgstr "Air Force"
+
+#: my-evolution/Locations.h:30
+msgid "Ajaccio/Campo dell'Oro"
+msgstr "Ajaccio/Campo dell'Oro"
+
+#: my-evolution/Locations.h:31
+msgid "Akeno Ab"
+msgstr "Akeno Ab"
+
+#: my-evolution/Locations.h:32
+msgid "Akita Airport"
+msgstr "Akita Airport"
+
+#: my-evolution/Locations.h:33
+msgid "Akron"
+msgstr "Akron"
+
+#: my-evolution/Locations.h:34
+msgid "Akrotiri"
+msgstr "Akrotiri"
+
+#: my-evolution/Locations.h:35
+msgid "Alabama"
+msgstr "Alabama"
+
+#: my-evolution/Locations.h:36
+msgid "Al Ahsa"
+msgstr "Al Ahsa"
+
+#: my-evolution/Locations.h:37
+msgid "Al Ain"
+msgstr "Al Ain"
+
+#: my-evolution/Locations.h:38
+msgid "Alamogordo"
+msgstr "Alamogordo"
+
+#: my-evolution/Locations.h:39
+msgid "Alamosa"
+msgstr "Alamosa"
+
+#: my-evolution/Locations.h:40
+msgid "Alaska"
+msgstr "Alaska"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr "Al Baha"
+
+#: my-evolution/Locations.h:43
+msgid "Albany"
+msgstr "Albany"
+
+#: my-evolution/Locations.h:44
+msgid "Albenga"
+msgstr "Albenga"
+
+#: my-evolution/Locations.h:45
+msgid "Alberta"
+msgstr "Alberta"
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr "Alborg"
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr "Albuquerque"
+
+#: my-evolution/Locations.h:48
+msgid "Alderney"
+msgstr "Alderney"
+
+#: my-evolution/Locations.h:49
+msgid "Alesund"
+msgstr "Alesund"
+
+#: my-evolution/Locations.h:50
+msgid "Alexandria"
+msgstr "Alexandria"
+
+#: my-evolution/Locations.h:51
+msgid "Alexandria-Esler"
+msgstr "Alexandria-Esler"
+
+#: my-evolution/Locations.h:52
+msgid "Alexandria/Nouzha"
+msgstr "Alexandria/Nouzha"
+
+#: my-evolution/Locations.h:53
+msgid "Alexandroupolis"
+msgstr "Alexandroupolis"
+
+#: my-evolution/Locations.h:55
+msgid "Alghero"
+msgstr "Alghero"
+
+#: my-evolution/Locations.h:56
+msgid "Algona"
+msgstr "Algona"
+
+#: my-evolution/Locations.h:57
+msgid "Alicante"
+msgstr "Alicante"
+
+#: my-evolution/Locations.h:58
+msgid "Alice"
+msgstr "Alice"
+
+#: my-evolution/Locations.h:59
+msgid "Alice Springs"
+msgstr "Alice Springs"
+
+#: my-evolution/Locations.h:60
+msgid "Al-Jouf"
+msgstr "Al-Jouf"
+
+#: my-evolution/Locations.h:61
+msgid "Allentown"
+msgstr "Allentown"
+
+#: my-evolution/Locations.h:62
+msgid "Alliance"
+msgstr "Alliance"
+
+#: my-evolution/Locations.h:63
+msgid "Alma"
+msgstr "Alma"
+
+#: my-evolution/Locations.h:64
+msgid "Almeria"
+msgstr "Almeria"
+
+#: my-evolution/Locations.h:65
+msgid "Alpena"
+msgstr "Alpena"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr "Al Qaysumah"
+
+#: my-evolution/Locations.h:67
+msgid "Alta"
+msgstr "Alta"
+
+#: my-evolution/Locations.h:68
+msgid "Altamira"
+msgstr "Altamira"
+
+#: my-evolution/Locations.h:69
+msgid "Alton"
+msgstr "Alton"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr "Altoona"
+
+#: my-evolution/Locations.h:71
+msgid "Alturas"
+msgstr "Alturas"
+
+#: my-evolution/Locations.h:72
+msgid "Altus"
+msgstr "Altus"
+
+#: my-evolution/Locations.h:73
+msgid "Amami Airport"
+msgstr "Amami Airport"
+
+#: my-evolution/Locations.h:74
+msgid "Amapala"
+msgstr "Amapala"
+
+#: my-evolution/Locations.h:75
+msgid "Amarillo"
+msgstr "Amarillo"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr "Amasya"
+
+#: my-evolution/Locations.h:77
+msgid "Ambler"
+msgstr "Ambler"
+
+#: my-evolution/Locations.h:78
+msgid "Amelia"
+msgstr "Amelia"
+
+#: my-evolution/Locations.h:79
+msgid "Amendola"
+msgstr "Amendola"
+
+#: my-evolution/Locations.h:80
+msgid "Ames"
+msgstr "Ames"
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr "Amritsar"
+
+#: my-evolution/Locations.h:82
+msgid "Amsterdam"
+msgstr "Amsterdam"
+
+#: my-evolution/Locations.h:83
+msgid "Anadyr"
+msgstr "Anadyr"
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr "Anaktuvuk"
+
+#: my-evolution/Locations.h:85
+msgid "Anapa"
+msgstr "Anapa"
+
+#: my-evolution/Locations.h:86
+msgid "Anchorage"
+msgstr "Anchorage"
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr "Anchorage - Elmendorf AFB"
+
+#: my-evolution/Locations.h:88
+msgid "Ancona"
+msgstr "Ancona"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr "Andahuayla"
+
+#: my-evolution/Locations.h:90
+msgid "Anderson"
+msgstr "Anderson"
+
+#: my-evolution/Locations.h:91
+msgid "Andoya"
+msgstr "Andoya"
+
+#: my-evolution/Locations.h:92
+msgid "Andravida"
+msgstr "Andravida"
+
+#: my-evolution/Locations.h:93
+msgid "Andrews AFB"
+msgstr "Andrews AFB"
+
+#: my-evolution/Locations.h:94
+msgid "Angleton"
+msgstr "Angleton"
+
+#: my-evolution/Locations.h:95
+msgid "Aniak"
+msgstr "Aniak"
+
+#: my-evolution/Locations.h:96
+msgid "Ankara/Esenboga"
+msgstr "Ankara/Esenboğa"
+
+#: my-evolution/Locations.h:97
+msgid "Ankara/Etimesgut"
+msgstr "Ankara/Etimesgut"
+
+#: my-evolution/Locations.h:98
+msgid "Annaba"
+msgstr "Annaba"
+
+#: my-evolution/Locations.h:99
+msgid "Ann Arbor"
+msgstr "Ann Arbor"
+
+#: my-evolution/Locations.h:100
+msgid "Annette"
+msgstr "Annette"
+
+#: my-evolution/Locations.h:101
+msgid "Anniston"
+msgstr "Anniston"
+
+#: my-evolution/Locations.h:102
+msgid "Antalya"
+msgstr "Antalya"
+
+#: my-evolution/Locations.h:103
+msgid "Antartica"
+msgstr "Antartica"
+
+#: my-evolution/Locations.h:104
+msgid "Antigo"
+msgstr "Antigo"
+
+#: my-evolution/Locations.h:105
+msgid "Antigua"
+msgstr "Antigua"
+
+#: my-evolution/Locations.h:106
+msgid "Antigua and Barbuda"
+msgstr "Antigua and Barbuda"
+
+#: my-evolution/Locations.h:107
+msgid "Antofagasta"
+msgstr "Antofagasta"
+
+#: my-evolution/Locations.h:108
+msgid "Antwerpen/Deurne"
+msgstr "Antwerpen/Deurne"
+
+#: my-evolution/Locations.h:109
+msgid "Aomori Airport"
+msgstr "Aomori Airport"
+
+#: my-evolution/Locations.h:110
+msgid "Apalachicola"
+msgstr "Apalachicola"
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr "Appleton"
+
+#: my-evolution/Locations.h:112
+msgid "Aquadilla"
+msgstr "Aquadilla"
+
+#: my-evolution/Locations.h:113
+msgid "Aracaju"
+msgstr "Aracaju"
+
+#: my-evolution/Locations.h:114
+msgid "Arad"
+msgstr "Arad"
+
+#: my-evolution/Locations.h:115
+msgid "Arar"
+msgstr "Arar"
+
+#: my-evolution/Locations.h:116
+msgid "Araxos"
+msgstr "Araxos"
+
+#: my-evolution/Locations.h:117
+msgid "Arcata"
+msgstr "Arcata"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr "Ardmore"
+
+#: my-evolution/Locations.h:119
+msgid "Arequipa"
+msgstr "Arequipa"
+
+#: my-evolution/Locations.h:121
+msgid "Arica"
+msgstr "Arica"
+
+#: my-evolution/Locations.h:122
+msgid "Arizona"
+msgstr "Arizona"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr "Arkansas"
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr "Arkhangelsk"
+
+#: my-evolution/Locations.h:125
+msgid "Arlington"
+msgstr "Arlington"
+
+#: my-evolution/Locations.h:126
+msgid "Artigas"
+msgstr "Artigas"
+
+#: my-evolution/Locations.h:127
+msgid "Asahikawa Ab"
+msgstr "Asahikawa Ab"
+
+#: my-evolution/Locations.h:128
+msgid "Asahikawa Airport"
+msgstr "Asahikawa Airport"
+
+#: my-evolution/Locations.h:129
+msgid "Ashburnam"
+msgstr "Ashburnam"
+
+#: my-evolution/Locations.h:130
+msgid "Asheville"
+msgstr "Asheville"
+
+#: my-evolution/Locations.h:131
+msgid "Ashfield"
+msgstr "Ashfield"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr "Ashiya Ab"
+
+#: my-evolution/Locations.h:133
+msgid "Ashland"
+msgstr "Ashland"
+
+#: my-evolution/Locations.h:134
+msgid "Asia"
+msgstr "Asia"
+
+#: my-evolution/Locations.h:135
+msgid "Aspen"
+msgstr "Aspen"
+
+#: my-evolution/Locations.h:136
+msgid "Asswan"
+msgstr "Asswan"
+
+#: my-evolution/Locations.h:137
+msgid "Astoria"
+msgstr "Astoria"
+
+#: my-evolution/Locations.h:138
+msgid "Astrakhan"
+msgstr "Astrakhan"
+
+#: my-evolution/Locations.h:139
+msgid "Asturias"
+msgstr "Asturias"
+
+#: my-evolution/Locations.h:140
+msgid "Asuncion"
+msgstr "Asuncion"
+
+#: my-evolution/Locations.h:141
+msgid "Athens"
+msgstr "Athens"
+
+#: my-evolution/Locations.h:142
+msgid "Athinai"
+msgstr "Athinai"
+
+#: my-evolution/Locations.h:143
+msgid "Atlanta"
+msgstr "Atlanta"
+
+#: my-evolution/Locations.h:144
+msgid "Atlantic"
+msgstr "Atlantic"
+
+#: my-evolution/Locations.h:145
+msgid "Atlantic City"
+msgstr "Atlantic City"
+
+#: my-evolution/Locations.h:146
+msgid "Atsugi US NAS"
+msgstr "Atsugi US NAS"
+
+#: my-evolution/Locations.h:147
+msgid "Auburn"
+msgstr "Auburn"
+
+#: my-evolution/Locations.h:148
+msgid "Auckland"
+msgstr "Auckland"
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr "Augsburg"
+
+#: my-evolution/Locations.h:150
+msgid "Augusta"
+msgstr "Augusta"
+
+#: my-evolution/Locations.h:151
+msgid "Aurora"
+msgstr "Aurora"
+
+#: my-evolution/Locations.h:152
+msgid "Austin"
+msgstr "Austin"
+
+#: my-evolution/Locations.h:153
+msgid "Australasia"
+msgstr "Australasia"
+
+#: my-evolution/Locations.h:156
+msgid "Avalon"
+msgstr "Avalon"
+
+#: my-evolution/Locations.h:157
+msgid "Aviano"
+msgstr "Aviano"
+
+#: my-evolution/Locations.h:158
+msgid "Ayacucho"
+msgstr "Ayacucho"
+
+#: my-evolution/Locations.h:159
 msgid "Bage"
 msgstr "Bage"
 
+#: my-evolution/Locations.h:160
 msgid "Bagotville"
 msgstr "Bagotville"
 
-msgid "Bahamas"
-msgstr "Bahamalar"
-
+#: my-evolution/Locations.h:162
 msgid "Bahia Blanca"
 msgstr "Bahia Blanca"
 
+#: my-evolution/Locations.h:163
 msgid "Bahias de Huatulco"
 msgstr "Bahias de Huatulco"
 
-msgid "Bahrain"
-msgstr "Bahreyn"
-
+#: my-evolution/Locations.h:165
 msgid "Baker City"
 msgstr "Baker City"
 
+#: my-evolution/Locations.h:166
 msgid "Bakersfield"
 msgstr "Bakersfield"
 
+#: my-evolution/Locations.h:167
 msgid "Bale-Mulhouse"
 msgstr "Bale-Mulhouse"
 
+#: my-evolution/Locations.h:168
 msgid "Balikesir"
 msgstr "Balıkesir"
 
+#: my-evolution/Locations.h:169
 msgid "Balikesir/Bandirma"
 msgstr "Balıkesir/Bandırma"
 
+#: my-evolution/Locations.h:170
 msgid "Ball Mountain"
 msgstr "Ball Mountain"
 
-msgid "Baltic"
-msgstr "Baltık"
-
+#: my-evolution/Locations.h:171
 msgid "Baltimore"
 msgstr "Baltimore"
 
+#: my-evolution/Locations.h:172
 msgid "Baltimore-Glen Burnie"
 msgstr "Baltimore-Glen Burnie"
 
+#: my-evolution/Locations.h:173
 msgid "Banak"
 msgstr "Banak"
 
+#: my-evolution/Locations.h:174
 msgid "Bandarabbass"
 msgstr "Bandarabbass"
 
-msgid "Bangladesh"
-msgstr "Bangladeş"
-
+#: my-evolution/Locations.h:175
 msgid "Bangor"
 msgstr "Bangor"
 
-msgid "Bar Harbor"
-msgstr "Bar Harbor"
-
+#: my-evolution/Locations.h:176
 msgid "Baracoa"
 msgstr "Baracoa"
 
-msgid "Barbados"
-msgstr "Barbados"
-
+#: my-evolution/Locations.h:177
 msgid "Barbers Point"
 msgstr "Barbers Point"
 
+#: my-evolution/Locations.h:178
 msgid "Barcelona"
 msgstr "Barcelona"
 
+#: my-evolution/Locations.h:179
 msgid "Bardufoss"
 msgstr "Bardufoss"
 
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr "Bar Harbor"
+
+#: my-evolution/Locations.h:181
 msgid "Bari"
 msgstr "Bari"
 
+#: my-evolution/Locations.h:182
 msgid "Bariloche"
 msgstr "Bariloche"
 
+#: my-evolution/Locations.h:183
 msgid "Barinas"
 msgstr "Barinas"
 
+#: my-evolution/Locations.h:184
 msgid "Barking Sand"
 msgstr "Barking Sand"
 
+#: my-evolution/Locations.h:185
 msgid "Barksdale"
 msgstr "Barksdale"
 
+#: my-evolution/Locations.h:186
 msgid "Barnaul"
 msgstr "Barnaul"
 
+#: my-evolution/Locations.h:187
 msgid "Barquisimeto"
 msgstr "Barquisimeto"
 
+#: my-evolution/Locations.h:188
 msgid "Barranquilla/Ernestocortissoz"
 msgstr "Barranquilla/Ernestocortissoz"
 
+#: my-evolution/Locations.h:189
 msgid "Barrow"
 msgstr "Barrow"
 
+#: my-evolution/Locations.h:190
 msgid "Barter Island"
 msgstr "Barter Island"
 
+#: my-evolution/Locations.h:191
 msgid "Bartlesville"
 msgstr "Bartlesville"
 
+#: my-evolution/Locations.h:192
 msgid "Bartow"
 msgstr "Bartow"
 
-msgid "Base"
-msgstr "Ana"
-
-msgid "Basic"
-msgstr "Temel"
-
-msgid "Basics"
-msgstr "Temel"
-
+#: my-evolution/Locations.h:193
 msgid "Bastia"
 msgstr "Bastia"
 
+#: my-evolution/Locations.h:194
 msgid "Batesville"
 msgstr "Batesville"
 
+#: my-evolution/Locations.h:195
 msgid "Batman"
 msgstr "Batman"
 
+#: my-evolution/Locations.h:196
 msgid "Baton Rouge"
 msgstr "Baton Rouge"
 
+#: my-evolution/Locations.h:197
 msgid "Battle Creek"
 msgstr "Battle Creek"
 
+#: my-evolution/Locations.h:198
 msgid "Battle Mountain"
 msgstr "Battle Mountain"
 
+#: my-evolution/Locations.h:199
 msgid "Bauru"
 msgstr "Bauru"
 
+#: my-evolution/Locations.h:200
 msgid "Bayamo"
 msgstr "Bayamo"
 
+#: my-evolution/Locations.h:201
 msgid "Bayreuth"
 msgstr "Bayreuth"
 
-msgid "Bcc"
-msgstr "Gizli"
-
-msgid "Bcc:"
-msgstr "Gizli:"
-
+#: my-evolution/Locations.h:202
 msgid "Beatrice"
 msgstr "Beatrice"
 
+#: my-evolution/Locations.h:203
 msgid "Beaufort"
 msgstr "Beaufort"
 
+#: my-evolution/Locations.h:204
 msgid "Beaumont"
 msgstr "Beaumont"
 
+#: my-evolution/Locations.h:205
 msgid "Beaumont-Port Arthur"
 msgstr "Beaumont-Port Arthur"
 
+#: my-evolution/Locations.h:206
 msgid "Beauvais-Tille"
 msgstr "Beauvais-Tille"
 
+#: my-evolution/Locations.h:207
 msgid "Beauvechain"
 msgstr "Beauvechain"
 
+#: my-evolution/Locations.h:208
 msgid "Beckley"
 msgstr "Beckley"
 
+#: my-evolution/Locations.h:209
 msgid "Bedford"
 msgstr "Bedford"
 
-msgid "Begins: <b>"
-msgstr "Başlangıç: <b>"
-
+#: my-evolution/Locations.h:210
 msgid "Beijing"
 msgstr "Beijing"
 
+#: my-evolution/Locations.h:211
 msgid "Beirut"
 msgstr "Beirut"
 
+#: my-evolution/Locations.h:212
 msgid "Beja"
 msgstr "Beja"
 
-msgid "Belarus"
-msgstr "Belarus"
-
+#: my-evolution/Locations.h:213
 msgid "Belem"
 msgstr "Belem"
 
+#: my-evolution/Locations.h:214
 msgid "Belfast/Aldergrove"
 msgstr "Belfast/Aldergrove"
 
+#: my-evolution/Locations.h:215
 msgid "Belfast/Harbour"
 msgstr "Belfast/Harbour"
 
-msgid "Belgium"
-msgstr "Belçika"
-
+#: my-evolution/Locations.h:217
 msgid "Belgorod"
 msgstr "Belgorod"
 
-msgid "Belize"
-msgstr "Belize"
-
+#: my-evolution/Locations.h:219
 msgid "Belleville"
 msgstr "Belleville"
 
+#: my-evolution/Locations.h:220
 msgid "Bellingham"
 msgstr "Bellingham"
 
+#: my-evolution/Locations.h:221
 msgid "Belmar-Farmingdale"
 msgstr "Belmar-Farmingdale"
 
+#: my-evolution/Locations.h:222
 msgid "Belo Horizonte"
 msgstr "Belo Horizonte"
 
+#: my-evolution/Locations.h:223
 msgid "Belo Horizonte Apt"
 msgstr "Belo Horizonte Apt"
 
+#: my-evolution/Locations.h:224
 msgid "Bemidji"
 msgstr "Bemidji"
 
+#: my-evolution/Locations.h:225
 msgid "Benbecula"
 msgstr "Benbecula"
 
-msgid "Benin"
-msgstr "Benin"
-
+#: my-evolution/Locations.h:226
 msgid "Benina"
 msgstr "Benina"
 
+#: my-evolution/Locations.h:227
 msgid "Benton Harbor"
 msgstr "Benton Harbor"
 
+#: my-evolution/Locations.h:228
 msgid "Bentonville"
 msgstr "Bentonville"
 
+#: my-evolution/Locations.h:229
 msgid "Beograd"
 msgstr "Beograd"
 
+#: my-evolution/Locations.h:230
 msgid "Bergamo"
 msgstr "Bergamo"
 
+#: my-evolution/Locations.h:231
 msgid "Bergen"
 msgstr "Bergen"
 
+#: my-evolution/Locations.h:232
 msgid "Bergstrom AFB"
 msgstr "Bergstrom AFB"
 
+#: my-evolution/Locations.h:233
 msgid "Berlevag"
 msgstr "Berlevag"
 
+#: my-evolution/Locations.h:234
 msgid "Berlin"
 msgstr "Berlin"
 
+#: my-evolution/Locations.h:235
 msgid "Berlin-Tegel"
 msgstr "Berlin-Tegel"
 
+#: my-evolution/Locations.h:236
 msgid "Berlin-Tempelhof"
 msgstr "Berlin-Tempelhof"
 
-msgid "Bermuda"
-msgstr "Bermuda"
-
+#: my-evolution/Locations.h:237
 msgid "Bern"
 msgstr "Bern"
 
+#: my-evolution/Locations.h:238
 msgid "Bethel"
 msgstr "Bethel"
 
+#: my-evolution/Locations.h:239
 msgid "Bethlehem Airport"
 msgstr "Bethlehem Airport"
 
+#: my-evolution/Locations.h:240
 msgid "Bettles"
 msgstr "Bettles"
 
+#: my-evolution/Locations.h:241
 msgid "Beverly"
 msgstr "Beverly"
 
-msgid "Bhutan"
-msgstr "Bhutan"
-
+#: my-evolution/Locations.h:242
 msgid "Biarritz-Bayonne"
 msgstr "Biarritz-Bayonne"
 
+#: my-evolution/Locations.h:243
 msgid "Bicycle Lake"
 msgstr "Bicycle Lake"
 
+#: my-evolution/Locations.h:244
+msgid "Biggin Hill"
+msgstr "Biggin Hill"
+
+#: my-evolution/Locations.h:245
 msgid "Big Piney"
 msgstr "Big Piney"
 
+#: my-evolution/Locations.h:246
 msgid "Big River Lake"
 msgstr "Big River Lake"
 
-msgid "Biggin Hill"
-msgstr "Biggin Hill"
-
+#: my-evolution/Locations.h:247
 msgid "Bilbao"
 msgstr "Bilbao"
 
+#: my-evolution/Locations.h:248
 msgid "Billings"
 msgstr "Billings"
 
+#: my-evolution/Locations.h:249
 msgid "Billund"
 msgstr "Billund"
 
+#: my-evolution/Locations.h:250
 msgid "Binghamton"
 msgstr "Binghamton"
 
+#: my-evolution/Locations.h:251
 msgid "Birmingham"
 msgstr "Birmingham"
 
-msgid "Birth Date"
-msgstr "Doğum Günü"
-
-msgid "Birthda_y:"
-msgstr "_Doğum günü:"
-
+#: my-evolution/Locations.h:252
 msgid "Bisha"
 msgstr "Bisha"
 
+#: my-evolution/Locations.h:253
 msgid "Bishop"
 msgstr "Bishop"
 
+#: my-evolution/Locations.h:254
 msgid "Bismark"
 msgstr "Bismark"
 
+#: my-evolution/Locations.h:255
 msgid "Blackpool"
 msgstr "Blackpool"
 
+#: my-evolution/Locations.h:256
 msgid "Blagoveschensk"
 msgstr "Blagoveschensk"
 
+#: my-evolution/Locations.h:257
 msgid "Blanding"
 msgstr "Blanding"
 
-msgid "Blank forms at end:"
-msgstr "Sonda boş formlar:"
-
+#: my-evolution/Locations.h:258
 msgid "Block Island"
 msgstr "Block Island"
 
+#: my-evolution/Locations.h:259
 msgid "Bloemfontein J. B. M. Hertzog "
 msgstr "Bloemfontein J. B. M. Hertzog "
 
+#: my-evolution/Locations.h:260
 msgid "Bloomington"
 msgstr "Bloomington"
 
+#: my-evolution/Locations.h:261
 msgid "Blue Canyon"
 msgstr "Blue Canyon"
 
+#: my-evolution/Locations.h:262
 msgid "Bluefield"
 msgstr "Bluefield"
 
+#: my-evolution/Locations.h:263
 msgid "Bluefields"
 msgstr "Bluefields"
 
+#: my-evolution/Locations.h:264
 msgid "Blythe"
 msgstr "Blythe"
 
+#: my-evolution/Locations.h:265
 msgid "Boa Vista"
 msgstr "Boa Vista"
 
+#: my-evolution/Locations.h:266
 msgid "Bocas del Toro"
 msgstr "Bocas del Toro"
 
+#: my-evolution/Locations.h:267
 msgid "Bodo"
 msgstr "Bodo"
 
-msgid "Body"
-msgstr "Gövde"
-
-msgid "Body contains"
-msgstr "Gövde içerir"
-
-msgid "Body contents"
-msgstr "Gövde içerir"
-
-msgid "Body does not contain"
-msgstr "Gövde içermez"
-
-msgid "Body or subject contains"
-msgstr "Gövde ya da konu içerir"
-
+#: my-evolution/Locations.h:268
 msgid "Bogota/Eldorado"
 msgstr "Bogota/Eldorado"
 
+#: my-evolution/Locations.h:269
 msgid "Boise"
 msgstr "Boise"
 
-msgid "Bolivia"
-msgstr "Bolivya"
-
+#: my-evolution/Locations.h:271
 msgid "Bologna"
 msgstr "Bologna"
 
+#: my-evolution/Locations.h:272
 msgid "Bolzano"
 msgstr "Bolzano"
 
+#: my-evolution/Locations.h:273
 msgid "Bombay/Santacruz"
 msgstr "Bombay/Santacruz"
 
+#: my-evolution/Locations.h:274
 msgid "Boone"
 msgstr "Boone"
 
+#: my-evolution/Locations.h:275
 msgid "Bordeaux"
 msgstr "Bordeaux"
 
+#: my-evolution/Locations.h:276
 msgid "Borger"
 msgstr "Borger"
 
+#: my-evolution/Locations.h:277
 msgid "Bornholm"
 msgstr "Bornholm"
 
+#: my-evolution/Locations.h:278
 msgid "Boscombe Down"
 msgstr "Boscombe Down"
 
-msgid "Bosnia And Herzegowina"
-msgstr "Bosna Hersek"
-
+#: my-evolution/Locations.h:279
 msgid "Bosnia-Herzegovina"
 msgstr "Bosnia-Herzegovina"
 
+#: my-evolution/Locations.h:280
 msgid "Boston"
 msgstr "Boston"
 
-msgid "Botswana"
-msgstr "Botswana"
-
-msgid "Bottom:"
-msgstr "Alt:"
-
+#: my-evolution/Locations.h:281
 msgid "Boulmer"
 msgstr "Boulmer"
 
+#: my-evolution/Locations.h:282
 msgid "Bourges"
 msgstr "Bourges"
 
+#: my-evolution/Locations.h:283
 msgid "Bournemouth"
 msgstr "Bournemouth"
 
-msgid "Bouvet Island"
-msgstr "Bouvet Island"
-
+#: my-evolution/Locations.h:284
 msgid "Bowling Green"
 msgstr "Bowling Green"
 
+#: my-evolution/Locations.h:285
 msgid "Bozeman"
 msgstr "Bozeman"
 
+#: my-evolution/Locations.h:286
 msgid "Bradford"
 msgstr "Bradford"
 
+#: my-evolution/Locations.h:287
 msgid "Bradshaw Field"
 msgstr "Bradshaw Field"
 
+#: my-evolution/Locations.h:288
 msgid "Brainerd"
 msgstr "Brainerd"
 
+#: my-evolution/Locations.h:289
 msgid "Brasilia"
 msgstr "Brasilia"
 
+#: my-evolution/Locations.h:290
 msgid "Brasschaat"
 msgstr "Brasschaat"
 
+#: my-evolution/Locations.h:291
 msgid "Bratislava"
 msgstr "Bratislava"
 
+#: my-evolution/Locations.h:292
 msgid "Bratsk"
 msgstr "Bratsk"
 
+#: my-evolution/Locations.h:293
 msgid "Braunschweig"
 msgstr "Braunschweig"
 
-msgid "Brazil"
-msgstr "Brezilya"
-
+#: my-evolution/Locations.h:295
 msgid "Bremen"
 msgstr "Bremen"
 
+#: my-evolution/Locations.h:296
 msgid "Bremerton"
 msgstr "Bremerton"
 
+#: my-evolution/Locations.h:297
 msgid "Brest"
 msgstr "Brest"
 
+#: my-evolution/Locations.h:298
 msgid "Bridgeport"
 msgstr "Bridgeport"
 
+#: my-evolution/Locations.h:299
 msgid "Brindisi"
 msgstr "Brindisi"
 
+#: my-evolution/Locations.h:300
 msgid "Brisbane"
 msgstr "Brisbane"
 
+#: my-evolution/Locations.h:301
 msgid "Bristol"
 msgstr "Bristol"
 
+#: my-evolution/Locations.h:302
 msgid "British Columbia"
 msgstr "British Columbia"
 
-msgid "British Indian Ocean Territory"
-msgstr "British Indian Ocean Territory"
-
+#: my-evolution/Locations.h:303
 msgid "Brno"
 msgstr "Brno"
 
+#: my-evolution/Locations.h:304
 msgid "Broadus"
 msgstr "Broadus"
 
+#: my-evolution/Locations.h:305
 msgid "Broken Bow"
 msgstr "Broken Bow"
 
-msgid "Broken clouds"
-msgstr "Parçalı bulutlu"
-
+#: my-evolution/Locations.h:306
 msgid "Bronnoysund"
 msgstr "Bronnoysund"
 
+#: my-evolution/Locations.h:307
 msgid "Brookings"
 msgstr "Brookings"
 
+#: my-evolution/Locations.h:308
 msgid "Brooksville"
 msgstr "Brooksville"
 
+#: my-evolution/Locations.h:309
 msgid "Broome"
 msgstr "Broome"
 
+#: my-evolution/Locations.h:310
 msgid "Brownsville"
 msgstr "Brownsville"
 
-msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
-
+#: my-evolution/Locations.h:311
 msgid "Brunswick"
 msgstr "Brunswick"
 
+#: my-evolution/Locations.h:312
 msgid "Brussels-National Airport"
 msgstr "Brussels-National Airport"
 
+#: my-evolution/Locations.h:313
 msgid "Bryansk"
 msgstr "Bryansk"
 
+#: my-evolution/Locations.h:314
 msgid "Bryce Canyon"
 msgstr "Bryce Canyon"
 
+#: my-evolution/Locations.h:315
 msgid "Bucaramanga/Palonegro"
 msgstr "Bucaramanga/Palonegro"
 
+#: my-evolution/Locations.h:316
 msgid "Bucuresti"
 msgstr "Bucuresti"
 
+#: my-evolution/Locations.h:317
 msgid "Bucuresti-Otopeni"
 msgstr "Bucuresti-Otopeni"
 
+#: my-evolution/Locations.h:318
 msgid "Budapest"
 msgstr "Budapest"
 
+#: my-evolution/Locations.h:319
 msgid "Buffalo"
 msgstr "Buffalo"
 
-msgid "Bug buddy could not be run."
-msgstr "Bug-buddy çalıştırılamadı."
-
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug-buddy $PATH dizininde bulunamadı."
-
-msgid "Bulgaria"
-msgstr "Bulgaristan"
-
+#: my-evolution/Locations.h:321
 msgid "Bullfrog"
 msgstr "Bullfrog"
 
+#: my-evolution/Locations.h:322
 msgid "Burbank"
 msgstr "Burbank"
 
+#: my-evolution/Locations.h:323
 msgid "Burgas"
 msgstr "Burgas"
 
-msgid "Burkina Faso"
-msgstr "Burkina Faso"
-
+#: my-evolution/Locations.h:324
 msgid "Burley"
 msgstr "Burley"
 
+#: my-evolution/Locations.h:325
 msgid "Burlington"
 msgstr "Burlington"
 
+#: my-evolution/Locations.h:326
 msgid "Burnet"
 msgstr "Burnet"
 
+#: my-evolution/Locations.h:327
 msgid "Burns"
 msgstr "Burns"
 
+#: my-evolution/Locations.h:328
 msgid "Bursa"
 msgstr "Bursa"
 
-msgid "Burundi"
-msgstr "Burundi"
-
+#: my-evolution/Locations.h:329
 msgid "Burwell"
 msgstr "Burwell"
 
-msgid "Bus"
-msgstr "Meşg"
-
-msgid "Bus 2"
-msgstr "Meşgul 2"
-
-msgid "Bus Fax"
-msgstr "İşy Faks"
-
-msgid "Business"
-msgstr "Meslek"
-
-msgid "Business 2"
-msgstr "2. Meslek"
-
-msgid "Business Address"
-msgstr "İşyeri Adresi"
-
-msgid "Business Fax"
-msgstr "İşyeri Faksı"
-
-msgid "Business Phone"
-msgstr "İş Telefonu"
-
-msgid "Business Phone 2"
-msgstr "2. İş Telefonu"
-
-msgid "Busy"
-msgstr "Meşgul"
-
+#: my-evolution/Locations.h:330
 msgid "Butte"
 msgstr "Butte"
 
-msgid "By Company"
-msgstr "Şirkete Göre"
-
-msgid "By Sender"
-msgstr "Gönderene Göre"
-
-msgid "By Status"
-msgstr "Duruma Göre"
-
-msgid "By Subject"
-msgstr "Konuya Göre"
-
-msgid "CALUri"
-msgstr "CALUri"
-
-msgid "CORBA error"
-msgstr "CORBA hatası"
-
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-msgid "C_elsius"
-msgstr "D_erece"
-
-msgid "C_lose"
-msgstr "_Kapat"
-
-msgid "C_ontacts..."
-msgstr "_Bağlantılar..."
-
-msgid "C_ontaining:"
-msgstr "İç_eren:"
-
-msgid "C_ut"
-msgstr "_Kes"
-
-msgid "Ca_tegories..."
-msgstr "Kategoriler..."
-
+#: my-evolution/Locations.h:331
 msgid "Caen-Carpiquet"
 msgstr "Caen-Carpiquet"
 
+#: my-evolution/Locations.h:332
 msgid "Cagliari"
 msgstr "Cagliari"
 
+#: my-evolution/Locations.h:333
 msgid "Cairns"
 msgstr "Cairns"
 
+#: my-evolution/Locations.h:334
 msgid "Cairo"
 msgstr "Cairo"
 
+#: my-evolution/Locations.h:335
 msgid "Calabozo"
 msgstr "Calabozo"
 
+#: my-evolution/Locations.h:336
 msgid "Calcutta/Dum Dum"
 msgstr "Calcutta/Dum Dum"
 
+#: my-evolution/Locations.h:337
 msgid "Caldwell"
 msgstr "Caldwell"
 
-msgid "Calendar"
-msgstr "Takvim"
-
-msgid "Calendar Message"
-msgstr "Takvim İletisi"
-
-msgid "Calendar URI"
-msgstr "Takvim URI"
-
-msgid "Calendar and Tasks Settings"
-msgstr "Takvim ve Görev Ayarları"
-
-msgid "Calendar file could not be updated!\n"
-msgstr "Takvim dosyası güncellenemedi!\n"
-
-msgid "Calendar information"
-msgstr "Takvim bilgisi"
-
+#: my-evolution/Locations.h:338
 msgid "Calgary"
 msgstr "Calgary"
 
+#: my-evolution/Locations.h:339
 msgid "Cali/Alfonso Bonillaaragon"
 msgstr "Cali/Alfonso Bonillaaragon"
 
+#: my-evolution/Locations.h:340
 msgid "Caliente"
 msgstr "Caliente"
 
+#: my-evolution/Locations.h:341
 msgid "California"
 msgstr "California"
 
-msgid "Callback"
-msgstr "Geri Arama"
-
-msgid "Callback Phone"
-msgstr "Geri Arama Telefonu"
-
+#: my-evolution/Locations.h:342
 msgid "Calvi-Ste-Catherine"
 msgstr "Calvi-Ste-Catherine"
 
+#: my-evolution/Locations.h:343
 msgid "Camaguey"
 msgstr "Camaguey"
 
+#: my-evolution/Locations.h:344
 msgid "Camarillo"
 msgstr "Camarillo"
 
-msgid "Cambodia"
-msgstr "Kamboçya"
-
+#: my-evolution/Locations.h:345
 msgid "Cambridge"
 msgstr "Cambridge"
 
+#: my-evolution/Locations.h:346
 msgid "Cameron"
 msgstr "Cameron"
 
-msgid "Cameroon"
-msgstr "Kamerun"
-
+#: my-evolution/Locations.h:347
 msgid "Camiri"
 msgstr "Camiri"
 
-msgid "Camp Stanley/H-207"
-msgstr "Camp Stanley/H-207"
-
+#: my-evolution/Locations.h:348
 msgid "Campeche"
 msgstr "Campeche"
 
+#: my-evolution/Locations.h:349
 msgid "Campinas"
 msgstr "Campinas"
 
+#: my-evolution/Locations.h:350
 msgid "Campo"
 msgstr "Campo"
 
+#: my-evolution/Locations.h:351
 msgid "Campo Grande"
 msgstr "Campo Grande"
 
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr "Camp Stanley/H-207"
+
+#: my-evolution/Locations.h:353
 msgid "Canaan"
 msgstr "Canaan"
 
-msgid "Canada"
-msgstr "Kanada"
-
+#: my-evolution/Locations.h:355
 msgid "Canarias/Fuerteventura"
 msgstr "Canarias/Fuerteventura"
 
+#: my-evolution/Locations.h:356
 msgid "Canarias/Gran Canaria"
 msgstr "Canarias/Gran Canaria"
 
+#: my-evolution/Locations.h:357
 msgid "Canarias/Hierro"
 msgstr "Canarias/Hierro"
 
-msgid "Canarias/La Palma"
-msgstr "Canarias/La Palma"
-
+#: my-evolution/Locations.h:358
 msgid "Canarias/Lanzarote"
 msgstr "Canarias/Lanzarote"
 
+#: my-evolution/Locations.h:359
+msgid "Canarias/La Palma"
+msgstr "Canarias/La Palma"
+
+#: my-evolution/Locations.h:360
 msgid "Canarias/Tenerife Norte"
 msgstr "Canarias/Tenerife Norte"
 
+#: my-evolution/Locations.h:361
 msgid "Canarias/Tenerife Sur"
 msgstr "Canarias/Tenerife Sur"
 
+#: my-evolution/Locations.h:362
 msgid "Canberra"
 msgstr "Canberra"
 
-msgid "Cancel"
-msgstr "İptal"
-
-msgid "Cancel All"
-msgstr "Hepsini İptal Et"
-
-msgid "Cancel Mee_ting"
-msgstr "Toplantıyı İ_ptal Et"
-
-msgid "Cancel Operation"
-msgstr "İşlemi İ_ptal Et"
-
-msgid "Cancel Task"
-msgstr "Görevi İptal Et"
-
-msgid "Cancel the current mail operation"
-msgstr "Şimdiki e-posta işlemini iptal et"
-
-msgid "Cancel the meeting for this item"
-msgstr "Bu öğe için toplantıyı iptal et"
-
-msgid "Cancel this task"
-msgstr "Bu görevi iptal et"
-
-msgid "Cancelled"
-msgstr "İptal Edildi"
-
-msgid "Cancelled."
-msgstr "İptal edildi."
-
-msgid "Cancelling..."
-msgstr "İptal ediliyor..."
-
+#: my-evolution/Locations.h:363
 msgid "Cancun"
 msgstr "Cancun"
 
+#: my-evolution/Locations.h:364
 msgid "Cannes-Mandelieu"
 msgstr "Cannes-Mandelieu"
 
-msgid "Cannot access the Ximian Evolution shell."
-msgstr "Ximian Evolution Kabuğuna erişilemedi."
-
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "%s dizinine ileti eklenemedi: %s"
-
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "İleti mbox dosyasına eklenemedi (%s): %s"
-
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "İleti mh dizinine eklenemedi: %s: %s"
-
-msgid "Cannot attach file %s: %s"
-msgstr "%s dosyası eklenemedi: %s"
-
-msgid "Cannot attach file %s: not a regular file"
-msgstr "%s dosyası eklenemedi: Normal bir dosya değil."
-
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Boru yaratılamadı: %s"
-
-msgid "Cannot check folder: %s: %s"
-msgstr "%s dizini alınamadı: %s"
-
-msgid "Cannot copy a folder over itself."
-msgstr "Bir dizin üzerine kopyalanamaz."
-
-msgid "Cannot copy folder: %s"
-msgstr "Dizin kopyalanamadı: %s"
-
-msgid "Cannot create a folder with that name"
-msgstr "Bu isimde bir dizin yaratılamadı"
-
-msgid "Cannot create folder lock on %s: %s"
-msgstr "%s üzerinde dizin kilitlemesi yaratılamadı: %s"
-
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Dizin oluşturulamadı: Geçersiz işlem"
-
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Çıkış dosyası yaratılamadı: %s:\n"
-" %s"
-
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"%s dizini yaratılamadı\n"
-"\n"
-"Hata: %s"
-
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Belirlenen dizin yaratılamadı:\n"
-"%s"
-
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Dizin silinemedi:\n"
-"%s"
-
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "%s dizini silinemedi. Geçersiz işlem"
-
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "%s dizini silinemedi: Böyle bir dizin yok"
-
-msgid "Cannot get folder: %s: %s"
-msgstr "%s dizini alınamadı: %s"
-
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Dizin alınamadı: Gerçersiz"
-
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"İleti alınamadı: %s\n"
-"  %s"
-
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"%s iletisi %s dizininden alınamadı\n"
-"  %s"
-
-msgid "Cannot initialize Evolution's composer."
-msgstr "Evolution posta programı açılamadı."
-
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Evolution'ın ileti dizin bilgi bileşeni başlatılamadı."
-
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Evolution'ın posta programı başlatılamadı."
-
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Evolution'ın ileti yapılandırma bileşeni başlatılamadı."
-
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Bonobo parçalar sistemi başlatılamadı."
-
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ximian Evolution Kabuğu başlatılamadı: %s"
-
-msgid "Cannot move a folder over itself."
-msgstr "Bir dizin kendi üzerine taşınamaz."
-
-msgid "Cannot move folder: %s"
-msgstr "Dizin taşınamadı: %s"
-
-msgid "Cannot open MH directory path: %s: %s"
-msgstr "MH dizin yolu açılamadı: %s: %s"
-
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "%s posta kutusu açılamadı: %s\n"
-
-msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Maildir dizini açılamadı: %s: %s"
-
-msgid "Cannot open message"
-msgstr "İleti açılamadı"
-
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Geçici posta kutusu açılamadı: %s"
-
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Arama deyimi ayrıştırılamadı: %s:\n"
-"%s"
-
-msgid "Cannot register on OAF"
-msgstr "OAF'a kayıt yapılamadı"
-
-msgid "Cannot register storage with shell"
-msgstr "Depo kabuğa kayıt ettirilemedi"
-
-msgid ""
-"Cannot rename folder:\n"
-"%s"
-msgstr ""
-"Dizin yeniden adlandırılamadı:\n"
-"%s"
-
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
-
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
-
-msgid "Cannot send message: no recipients defined."
-msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
-
-msgid "Cannot send message: sender address not defined."
-msgstr "İleti gönderilemiyor: gönderen adresi geçersiz."
-
-msgid "Cannot send message: sender address not valid."
-msgstr "İleti gönderilemiyor: gönderen adresi geçersiz"
-
-msgid "Cannot set up local storage -- %s"
-msgstr "Yerel kayıt kurulamadı -- %s"
-
-msgid "Cannot sign this message: no password provided"
-msgstr "Bu ileti imzalanamadı, çünkü parola girilmedi"
-
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Bu ileti imzalanamadı: İmzalanacak metin yok"
-
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Dizin aktarılamadı:\n"
-"%s"
-
+#: my-evolution/Locations.h:365
 msgid "Cantwell"
 msgstr "Cantwell"
 
+#: my-evolution/Locations.h:366
 msgid "Cape Girardeau"
 msgstr "Cape Girardeau"
 
+#: my-evolution/Locations.h:367
 msgid "Cape Hatteras"
 msgstr "Cape Hatteras"
 
+#: my-evolution/Locations.h:368
 msgid "Cape Lisburne"
 msgstr "Cape Lisburne"
 
+#: my-evolution/Locations.h:369
 msgid "Cape Newenham"
 msgstr "Cape Newenham"
 
+#: my-evolution/Locations.h:370
 msgid "Cape Romanzoff"
 msgstr "Cape Romanzoff"
 
+#: my-evolution/Locations.h:371
 msgid "Cape Town D. F. Malan "
 msgstr "Cape Town D. F. Malan "
 
-msgid "Cape Verde"
-msgstr "Cape Verde"
-
+#: my-evolution/Locations.h:372
 msgid "Capitan Corbeta"
 msgstr "Capitan Corbeta"
 
+#: my-evolution/Locations.h:373
 msgid "Capo Mele"
 msgstr "Capo Mele"
 
-msgid "Car"
-msgstr "Araba"
-
-msgid "Car Phone"
-msgstr "Araç Telefonu"
-
+#: my-evolution/Locations.h:374
 msgid "Caracas La Carlota"
 msgstr "Caracas La Carlota"
 
+#: my-evolution/Locations.h:375
 msgid "Caracas Maiquetia"
 msgstr "Caracas Maiquetia"
 
+#: my-evolution/Locations.h:376
 msgid "Caravelas"
 msgstr "Caravelas"
 
+#: my-evolution/Locations.h:377
 msgid "Carbondale"
 msgstr "Carbondale"
 
-msgid "Card ID already exists"
-msgstr "Bu kart numarası var"
-
-msgid "Card View"
-msgstr "Kart Görünümü"
-
-msgid "Card not found"
-msgstr "Kart bulunamadı"
-
-msgid "Card: "
-msgstr "Kart: "
-
+#: my-evolution/Locations.h:378
 msgid "Cardiff"
 msgstr "Cardiff"
 
+#: my-evolution/Locations.h:379
 msgid "Caribou"
 msgstr "Caribou"
 
+#: my-evolution/Locations.h:380
 msgid "Carlisle"
 msgstr "Carlisle"
 
+#: my-evolution/Locations.h:381
 msgid "Carlsbad"
 msgstr "Carlsbad"
 
+#: my-evolution/Locations.h:382
 msgid "Carroll"
 msgstr "Carroll"
 
+#: my-evolution/Locations.h:383
 msgid "Cartagena/Rafael Nunez"
 msgstr "Cartagena/Rafael Nunez"
 
+#: my-evolution/Locations.h:384
 msgid "Casa Granda"
 msgstr "Casa Granda"
 
+#: my-evolution/Locations.h:385
 msgid "Cascade"
 msgstr "Cascade"
 
-msgid "Case Sensitive"
-msgstr "Küçük/büyük Harfe Duyarlı"
-
+#: my-evolution/Locations.h:386
 msgid "Casper"
 msgstr "Casper"
 
+#: my-evolution/Locations.h:387
 msgid "Catacamas"
 msgstr "Catacamas"
 
+#: my-evolution/Locations.h:388
 msgid "Catania"
 msgstr "Catania"
 
-msgid "Categories"
-msgstr "Kategoriler"
-
-msgid "Categories: %s"
-msgstr "Kategoriler: %s"
-
-msgid "Category editor not available."
-msgstr "Kategori düzenleyici bulunamadı."
-
-msgid "Category is"
-msgstr "Kategori"
-
-msgid "Cayman Islands"
-msgstr "Cayman Adaları"
-
+#: my-evolution/Locations.h:390
 msgid "Cayo Largo del Sur"
 msgstr "Cayo Largo del Sur"
 
+#: my-evolution/Locations.h:391
 msgid "Cazaux"
 msgstr "Cazaux"
 
-msgid "Cc"
-msgstr "Bilgi"
-
-msgid "Cc:"
-msgstr "Bilgi:"
-
+#: my-evolution/Locations.h:392
 msgid "Cecil NAS"
 msgstr "Cecil NAS"
 
+#: my-evolution/Locations.h:393
 msgid "Cedar City"
 msgstr "Cedar City"
 
+#: my-evolution/Locations.h:394
 msgid "Cedar Rapids"
 msgstr "Cedar Rapids"
 
-msgid "Central African Republic"
-msgstr "Orta Afrika Cumhuriyeti"
-
-msgid "Central European"
-msgstr "Orta Avrupa"
-
+#: my-evolution/Locations.h:395
 msgid "Central and South America"
 msgstr "Central and South America"
 
+#: my-evolution/Locations.h:396
 msgid "Cervia"
 msgstr "Cervia"
 
+#: my-evolution/Locations.h:397
 msgid "Chacarita"
 msgstr "Chacarita"
 
-msgid "Chad"
-msgstr "Çad"
-
+#: my-evolution/Locations.h:398
 msgid "Chadron"
 msgstr "Chadron"
 
-msgid "Chair"
-msgstr "Sandalye"
-
-msgid "Chair Persons"
-msgstr "Toplantıyı Yönetenler"
-
+#: my-evolution/Locations.h:399
 msgid "Challis"
 msgstr "Challis"
 
+#: my-evolution/Locations.h:400
 msgid "Chamberlain"
 msgstr "Chamberlain"
 
+#: my-evolution/Locations.h:401
 msgid "Chambery"
 msgstr "Chambery"
 
+#: my-evolution/Locations.h:402
 msgid "Champaign"
 msgstr "Champaign"
 
+#: my-evolution/Locations.h:403
 msgid "Chandalar Lake"
 msgstr "Chandalar Lake"
 
+#: my-evolution/Locations.h:404
 msgid "Chandler"
 msgstr "Chandler"
 
-msgid "Change Anyway"
-msgstr "Yine de Değiştir"
-
-msgid "Change the name of this folder"
-msgstr "Bu dizinin adını değiştir"
-
-msgid "Change the properties of this folder"
-msgstr "Bu dizinin özelliklerini değiştir"
-
-msgid "Change the settings for the summary"
-msgstr "Özet ayarlarını değiştir"
-
-msgid "Change this folder's properties"
-msgstr "Bu dizinin özelliklerini değiştir"
-
-msgid "Changed Contact:"
-msgstr "Değiştirilen Bağlantı:"
-
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "\"%s\" biçiminden \"%s\" biçimine geçiliyor"
-
+#: my-evolution/Locations.h:405
 msgid "Chania"
 msgstr "Chania"
 
+#: my-evolution/Locations.h:406
 msgid "Chanute"
 msgstr "Chanute"
 
-msgid "Character Encoding"
-msgstr "Karakter Kodlaması"
-
+#: my-evolution/Locations.h:407
 msgid "Chariton"
 msgstr "Chariton"
 
+#: my-evolution/Locations.h:408
 msgid "Charleroi-Brussels South"
 msgstr "Charleroi-Brussels South"
 
+#: my-evolution/Locations.h:409
 msgid "Charles City"
 msgstr "Charles City"
 
+#: my-evolution/Locations.h:410
 msgid "Charleston"
 msgstr "Charleston"
 
+#: my-evolution/Locations.h:411
 msgid "Charlotte"
 msgstr "Charlotte"
 
+#: my-evolution/Locations.h:412
 msgid "Charlottesville"
 msgstr "Charlottesville"
 
+#: my-evolution/Locations.h:413
 msgid "Chatham"
 msgstr "Chatham"
 
+#: my-evolution/Locations.h:414
 msgid "Chattanooga"
 msgstr "Chattanooga"
 
+#: my-evolution/Locations.h:415
 msgid "Cheboksary"
 msgstr "Cheboksary"
 
-msgid "Check Address"
-msgstr "Adresi Denetle"
-
-msgid "Check Full Name"
-msgstr "Tam İsmi Kontrol Et"
-
-msgid "Check for new messages in all folders"
-msgstr "Yeni iletileri tüm dizinlerde denetle"
-
-msgid "Checking Service"
-msgstr "Servis Denetleniyor"
-
-msgid "Checking for New Mail"
-msgstr "Yeni İletiler Denetleniyor"
-
-msgid "Checking for new mail"
-msgstr "Yeni iletiler denetleniyor"
-
+#: my-evolution/Locations.h:416
 msgid "Cheju"
 msgstr "Cheju"
 
+#: my-evolution/Locations.h:417
 msgid "Chelyabinsk"
 msgstr "Chelyabinsk"
 
+#: my-evolution/Locations.h:418
 msgid "Chengdu"
 msgstr "Chengdu"
 
+#: my-evolution/Locations.h:419
 msgid "Cherbourg"
 msgstr "Cherbourg"
 
+#: my-evolution/Locations.h:420
 msgid "Cherry Point"
 msgstr "Cherry Point"
 
+#: my-evolution/Locations.h:421
 msgid "Chetumal"
 msgstr "Chetumal"
 
+#: my-evolution/Locations.h:422
 msgid "Cheyenne"
 msgstr "Cheyenne"
 
-msgid "Chia Tung"
-msgstr "Chia Tung"
-
+#: my-evolution/Locations.h:423
 msgid "Chiang Kai Shek"
 msgstr "Chiang Kai Shek"
 
+#: my-evolution/Locations.h:424
+msgid "Chia Tung"
+msgstr "Chia Tung"
+
+#: my-evolution/Locations.h:425
 msgid "Chiayi"
 msgstr "Chiayi"
 
+#: my-evolution/Locations.h:426
 msgid "Chicago-DuPage"
 msgstr "Chicago-DuPage"
 
+#: my-evolution/Locations.h:427
 msgid "Chicago-Lakefront"
 msgstr "Chicago-Lakefront"
 
+#: my-evolution/Locations.h:428
 msgid "Chicago-Midway"
 msgstr "Chicago-Midway"
 
+#: my-evolution/Locations.h:429
 msgid "Chicago-O'Hare"
 msgstr "Chicago-O'Hare"
 
+#: my-evolution/Locations.h:430
 msgid "Chichijima"
 msgstr "Chichijima"
 
+#: my-evolution/Locations.h:431
 msgid "Chiclayo"
 msgstr "Chiclayo"
 
+#: my-evolution/Locations.h:432
 msgid "Chico"
 msgstr "Chico"
 
+#: my-evolution/Locations.h:433
 msgid "Chicopee Falls"
 msgstr "Chicopee Falls"
 
+#: my-evolution/Locations.h:434
 msgid "Chievres"
 msgstr "Chievres"
 
+#: my-evolution/Locations.h:435
 msgid "Chihhang"
 msgstr "Chihhang"
 
+#: my-evolution/Locations.h:436
 msgid "Chihuahua"
 msgstr "Chihuahua"
 
+#: my-evolution/Locations.h:437
 msgid "Childress"
 msgstr "Childress"
 
-msgid "Chile"
-msgstr "Şili"
-
-msgid "China"
-msgstr "Çin"
-
+#: my-evolution/Locations.h:439
 msgid "China Lake"
 msgstr "China Lake"
 
+#: my-evolution/Locations.h:440
 msgid "Chinandega"
 msgstr "Chinandega"
 
-msgid "Chinese"
-msgstr "Çince"
-
+#: my-evolution/Locations.h:441
 msgid "Chinmem/Shatou"
 msgstr "Chinmem/Shatou"
 
+#: my-evolution/Locations.h:442
 msgid "Chino"
 msgstr "Chino"
 
+#: my-evolution/Locations.h:443
 msgid "Chippewa County"
 msgstr "Chippewa County"
 
+#: my-evolution/Locations.h:444
 msgid "Chita"
 msgstr "Chita"
 
-msgid "Chitose ASDF"
-msgstr "Chitose ASDF"
-
+#: my-evolution/Locations.h:445
 msgid "Chitose Ab"
 msgstr "Chitose Ab"
 
+#: my-evolution/Locations.h:446
+msgid "Chitose ASDF"
+msgstr "Chitose ASDF"
+
+#: my-evolution/Locations.h:447
 msgid "Chofu Airport"
 msgstr "Chofu Airport"
 
+#: my-evolution/Locations.h:448
 msgid "Choluteca"
 msgstr "Choluteca"
 
+#: my-evolution/Locations.h:449
 msgid "Chongju Ab"
 msgstr "Chongju Ab"
 
-msgid "Choose an action:"
-msgstr "Bir eylem seçin:"
-
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Evolution'a aktarmak istediğiniz dosyayı seçin ve listenin bu dosyanın "
-"türünü belirleyin.\n"
-"\n"
-"Eğer dosya türünü bilmiyorsanız \"Otomatik\" seçeneğini işaretleyin. Bu "
-"durumda Evolution dosya türünü bulmaya çalışacaktır."
-
+#: my-evolution/Locations.h:450
 msgid "Christchurch"
 msgstr "Christchurch"
 
-msgid "Christmas Island"
-msgstr "Christmas Island"
-
+#: my-evolution/Locations.h:452
 msgid "Chulitna"
 msgstr "Chulitna"
 
+#: my-evolution/Locations.h:453
 msgid "Churchill"
 msgstr "Churchill"
 
+#: my-evolution/Locations.h:454
 msgid "Churchill Falls"
 msgstr "Churchill Falls"
 
+#: my-evolution/Locations.h:455
 msgid "Cincinnati"
 msgstr "Cincinnati"
 
+#: my-evolution/Locations.h:456
 msgid "Circle City"
 msgstr "Circle City"
 
+#: my-evolution/Locations.h:457
 msgid "Ciudad Bolivar"
 msgstr "Ciudad Bolivar"
 
+#: my-evolution/Locations.h:458
+msgid "Ciudad del Carmen"
+msgstr "Ciudad del Carmen"
+
+#: my-evolution/Locations.h:459
 msgid "Ciudad Juarez"
 msgstr "Ciudad Juarez"
 
+#: my-evolution/Locations.h:460
 msgid "Ciudad Obregon"
 msgstr "Ciudad Obregon"
 
+#: my-evolution/Locations.h:461
 msgid "Ciudad Victoria"
 msgstr "Ciudad Victoria"
 
-msgid "Ciudad del Carmen"
-msgstr "Ciudad del Carmen"
-
+#: my-evolution/Locations.h:462
 msgid "Clarinda"
 msgstr "Clarinda"
 
+#: my-evolution/Locations.h:463
 msgid "Clarion"
 msgstr "Clarion"
 
+#: my-evolution/Locations.h:464
 msgid "Clarksburg"
 msgstr "Clarksburg"
 
-msgid "Classification"
-msgstr "Sınıflandırma"
-
+#: my-evolution/Locations.h:465
 msgid "Clayton"
 msgstr "Clayton"
 
+#: my-evolution/Locations.h:466
 msgid "Clayton Lake"
 msgstr "Clayton Lake"
 
-msgid "Clear"
-msgstr "Temizle"
-
-msgid "Clear sky"
-msgstr "Açık gökyüzü"
-
+#: my-evolution/Locations.h:467
 msgid "Clermont-Ferrand"
 msgstr "Clermont-Ferrand"
 
+#: my-evolution/Locations.h:468
 msgid "Cleveland"
 msgstr "Cleveland"
 
-msgid "Cleveland-Lakefront"
-msgstr "Cleveland-Lakefront"
-
+#: my-evolution/Locations.h:469
 msgid "Cleveland/Cuyahoga"
 msgstr "Cleveland/Cuyahoga"
 
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "\"Aktar\" düğmesine tıklayarak dosyaları Evolution'a aktarın."
-
-msgid "Click OK to close these connections and go offline"
-msgstr ""
-"Bu bağlantıları kapatmak ve İnternet bağlantısını ayırmak için Tamam "
-"düğmesine tıklayın"
-
-msgid "Click here for the address book"
-msgstr "Adres defteri için buraya tıklayın"
-
-msgid "Click here to add an attendee"
-msgstr "Katılımcı eklemek için tıklayın"
-
-msgid "Click to add a task"
-msgstr "Görev eklemek için tıklayın"
+#: my-evolution/Locations.h:470
+msgid "Cleveland-Lakefront"
+msgstr "Cleveland-Lakefront"
 
+#: my-evolution/Locations.h:471
 msgid "Clinton"
 msgstr "Clinton"
 
-msgid "Close"
-msgstr "Kapat"
-
-msgid "Close the current file"
-msgstr "Güncel dosyayı kapat"
-
-msgid "Close this item"
-msgstr "Bu öğeyi kapat"
-
-msgid "Close this window"
-msgstr "Bu pencereyi kapat"
-
-msgid "Closing connections..."
-msgstr "Bağlantılar kesiliyor..."
-
+#: my-evolution/Locations.h:472
 msgid "Clovis-Cannon AFB"
 msgstr "Clovis-Cannon AFB"
 
-msgid "Co_ntacts:"
-msgstr "_Bağlantılar: "
-
+#: my-evolution/Locations.h:473
 msgid "Cobija"
 msgstr "Cobija"
 
+#: my-evolution/Locations.h:474
 msgid "Cochabamba"
 msgstr "Cochabamba"
 
+#: my-evolution/Locations.h:475
 msgid "Cocoa Beach"
 msgstr "Cocoa Beach"
 
-msgid "Cocos (Keeling) Islands"
-msgstr "Cocos (Keeling) Adaları"
-
+#: my-evolution/Locations.h:476
 msgid "Cocos Island"
 msgstr "Cocos Island"
 
+#: my-evolution/Locations.h:477
 msgid "Cody"
 msgstr "Cody"
 
+#: my-evolution/Locations.h:478
 msgid "Coeur d'Alene"
 msgstr "Coeur d'Alene"
 
+#: my-evolution/Locations.h:479
 msgid "Cold Bay"
 msgstr "Cold Bay"
 
+#: my-evolution/Locations.h:480
 msgid "Colima"
 msgstr "Colima"
 
+#: my-evolution/Locations.h:481
 msgid "College Station"
 msgstr "College Station"
 
+#: my-evolution/Locations.h:482
 msgid "Colmar-Meyenheim"
 msgstr "Colmar-Meyenheim"
 
-msgid "Colombia"
-msgstr "Kolombiya"
-
+#: my-evolution/Locations.h:484
 msgid "Colonia"
 msgstr "Colonia"
 
-msgid "Color for overdue tasks"
-msgstr "Tamamlanamayan görevlerin rengi"
-
-msgid "Color for tasks due today"
-msgstr "Bugün tamamlanması gereken görevlerin rengi"
-
+#: my-evolution/Locations.h:485
 msgid "Colorado"
 msgstr "Colorado"
 
+#: my-evolution/Locations.h:486
 msgid "Colorado Springs"
 msgstr "Colorado Springs"
 
+#: my-evolution/Locations.h:487
 msgid "Columbia"
 msgstr "Columbia"
 
+#: my-evolution/Locations.h:488
 msgid "Columbia-McEntire"
 msgstr "Columbia-McEntire"
 
+#: my-evolution/Locations.h:489
 msgid "Columbus"
 msgstr "Columbus"
 
+#: my-evolution/Locations.h:490
 msgid "Columbus-Fort Benning"
 msgstr "Columbus-Fort Benning"
 
+#: my-evolution/Locations.h:491
 msgid "Columbus-Gahanna"
 msgstr "Columbus-Gahanna"
 
+#: my-evolution/Locations.h:492
 msgid "Columbus-OSU"
 msgstr "Columbus-OSU"
 
+#: my-evolution/Locations.h:493
 msgid "Columbus-W Point-Starkville"
 msgstr "Columbus-W Point-Starkville"
 
+#: my-evolution/Locations.h:494
 msgid "Colville"
 msgstr "Colville"
 
-msgid "Command not implemented"
-msgstr "Komut henüz tanınmıyor"
-
-msgid "Command parameter not implemented"
-msgstr "Komut parametresi henüz tanınmıyor"
-
-msgid "Comment contains"
-msgstr "Yorum içeriği"
-
-msgid "Common Name"
-msgstr "Ortak İsim"
-
+#: my-evolution/Locations.h:495
 msgid "Comodoro Rivadavia"
 msgstr "Comodoro Rivadavia"
 
-msgid "Comoros"
-msgstr "Comoros"
-
+#: my-evolution/Locations.h:496
 msgid "Comox"
 msgstr "Comox"
 
-msgid "Comp"
-msgstr "Şirk"
-
-msgid "Company"
-msgstr "Şirket"
-
-msgid "Company Phone"
-msgstr "Şirket Telefonu"
-
-msgid "Compare against"
-msgstr "Karşılaştır"
-
-msgid "Complete"
-msgstr "Tamamlandı"
-
-msgid "Complete."
-msgstr "Tamamlandı."
-
-msgid "Completed"
-msgstr "Tamamlandı"
-
-msgid "Completed "
-msgstr "Tamamlanan "
-
-msgid "Completion Date"
-msgstr "Tamamlanma Tarihi"
-
-msgid "Compose _New Message"
-msgstr "_Yeni İleti Oluştur"
-
-msgid "Compose a message"
-msgstr "Bir ileti yaz"
-
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Seçili iletideki tüm alıcılara bir cevap gönder"
-
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Seçilen iletinin e-posta listesine bir cevap gönder"
-
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Seçilen iletinin göndericisine bir cevap gönder"
-
-msgid "Composer"
-msgstr "Düzenleyici"
-
-msgid "Con_fidential"
-msgstr "_Gizli"
-
+#: my-evolution/Locations.h:497
 msgid "Conceicao Do Araguaia"
 msgstr "Conceicao Do Araguaia"
 
+#: my-evolution/Locations.h:498
 msgid "Concepcion"
 msgstr "Concepcion"
 
+#: my-evolution/Locations.h:499
 msgid "Concord"
 msgstr "Concord"
 
+#: my-evolution/Locations.h:500
 msgid "Concordia"
 msgstr "Concordia"
 
-msgid "Confidential"
-msgstr "Gizli"
-
-msgid "Configuration"
-msgstr "Yapılandırma"
-
-msgid "Configuration Database not found"
-msgstr "Yapılandırma Veritabanı bulunamadı"
-
-msgid "Configure the calendar's settings"
-msgstr "Takvim ayarlarını değiştir"
-
-msgid "Confirm when Expunging a folder"
-msgstr "Bir dizini silmeden önce onayla"
-
-msgid "Conflicting Contact:"
-msgstr "Çakışan Bağlantı:"
-
-msgid "Congo"
-msgstr "Kongo"
-
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Tebrikler, e-posta ayarları başarıyla tamamlandı.\n"
-"\n"
-"Şimdi Evolution kullanarak iletilerinizi alabilir \n"
-"ve gönderebilirsiniz.\n"
-"\n"
-"Ayarlarınızı kaydetmek için \"Bitiş\" düğmesine tıklayın."
-
+#: my-evolution/Locations.h:501
 msgid "Connaught"
 msgstr "Connaught"
 
+#: my-evolution/Locations.h:502
 msgid "Connecticut"
 msgstr "Connecticut"
 
-msgid "Connecting to LDAP server..."
-msgstr "LDAP sunucuya bağlantı kuruluyor..."
-
-msgid "Connecting to server..."
-msgstr "Sunucuya bağlantı kuruluyor..."
-
-msgid "Connection cancelled"
-msgstr "Bağlantı iptal edildi"
-
+#: my-evolution/Locations.h:503
 msgid "Conroe"
 msgstr "Conroe"
 
+#: my-evolution/Locations.h:504
 msgid "Constantine"
 msgstr "Constantine"
 
-msgid "Contact Editor"
-msgstr "Bağlantı Düzenleyici"
-
-msgid "Contact List Editor"
-msgstr "Bağlantı Listesi Düzenleyici"
-
-msgid "Contact Quick-Add"
-msgstr "Bağlantıyı Hızlı Ekle"
-
-msgid "Contacts"
-msgstr "Bağlantılar"
-
-msgid "Contacts: "
-msgstr "Bağlantılar: "
-
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution adres defteri mini kartını gösteren denetleyici."
-
-msgid "Cook Islands"
-msgstr "Cook Adaları"
-
+#: my-evolution/Locations.h:505
 msgid "Copper Harbor"
 msgstr "Copper Harbor"
 
-msgid "Copy"
-msgstr "Kopyala"
-
-msgid "Copy Link Location"
-msgstr "Adresi Kopyala"
-
-msgid "Copy folder"
-msgstr "Dizini kopyala"
-
-msgid "Copy message(s) to"
-msgstr "İleti(leri) buraya kopyala"
-
-msgid "Copy selected messages"
-msgstr "Seçili iletileri kopyala"
-
-msgid "Copy selected messages to another folder"
-msgstr "Seçili iletileri başka dizine kopyala"
-
-msgid "Copy selected task"
-msgstr "Seçili görevi kopyala"
-
-msgid "Copy the selection"
-msgstr "Seçimi kopyala"
-
-msgid "Copy this folder"
-msgstr "Bu Dizini Kopyala"
-
-msgid "Copy to Folder"
-msgstr "Dizine Kopyala"
-
-msgid "Copying"
-msgstr "Kopyalanıyor"
-
-msgid "Copying messages to %s"
-msgstr "İletiler %s'e kopyalanıyor"
-
+#: my-evolution/Locations.h:506
 msgid "Cordoba"
 msgstr "Cordoba"
 
+#: my-evolution/Locations.h:507
 msgid "Cordova"
 msgstr "Cordova"
 
+#: my-evolution/Locations.h:508
 msgid "Cork"
 msgstr "Cork"
 
+#: my-evolution/Locations.h:509
 msgid "Coro"
 msgstr "Coro"
 
+#: my-evolution/Locations.h:510
 msgid "Corona"
 msgstr "Corona"
 
+#: my-evolution/Locations.h:511
 msgid "Corpus Christi"
 msgstr "Corpus Christi"
 
+#: my-evolution/Locations.h:512
 msgid "Corpus Christi NAS"
 msgstr "Corpus Christi NAS"
 
+#: my-evolution/Locations.h:513
 msgid "Corrientes"
 msgstr "Corrientes"
 
+#: my-evolution/Locations.h:514
 msgid "Corsicana"
 msgstr "Corsicana"
 
+#: my-evolution/Locations.h:515
 msgid "Cortez"
 msgstr "Cortez"
 
+#: my-evolution/Locations.h:516
 msgid "Corumba"
 msgstr "Corumba"
 
-msgid "Costa Rica"
-msgstr "Kosta Rika"
-
-msgid "Cote d'Ivoire"
-msgstr "Cote d'Ivoire"
-
+#: my-evolution/Locations.h:518
 msgid "Cotulla"
 msgstr "Cotulla"
 
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "KPOP sunucuyla kimlik denetimi başarısız oldu: %s"
-
-msgid "Could not check POP server for new messages: %s"
-msgstr "Yeni iletileri almak için POP sunucusuna bağlantı kurulamadı: %s"
-
-msgid "Could not check mail file %s: %s"
-msgstr "E-posta dosyası %s denetlenemedi: %s"
-
-msgid "Could not close source folder %s: %s"
-msgstr "Kaynak dizin %s açılamadı: %s"
-
-msgid "Could not close temp folder: %s"
-msgstr "geçici dizin kapatılamadı: %s"
-
-msgid "Could not connect to %s (port %d): %s"
-msgstr "%s adresine bağlantı kurulamadı (%d): %s"
-
-msgid "Could not connect to POP server on %s."
-msgstr "%s üzerindeki POP sunucusuna bağlantı kurulamadı."
-
-msgid "Could not connect to server: %s"
-msgstr "%s sunucusuna bağlantı kurulamadı"
-
-msgid "Could not create a PGP encryption context."
-msgstr "PGP şifreli içerik oluşturulamıyor."
-
-msgid "Could not create a PGP signature context."
-msgstr "PGP imza dosyası oluşturulamadı."
-
-msgid "Could not create a PGP verification context."
-msgstr "PGP onaylama dosyası oluşturulamadı."
-
-msgid "Could not create a S/MIME certsonly context."
-msgstr "S/MIME şifreli içerik (sadece serifikalı) oluşturulamıyor."
-
-msgid "Could not create a S/MIME decode context."
-msgstr "S/MIME kodlama içeriği oluşturulamıyor."
-
-msgid "Could not create a S/MIME encryption context."
-msgstr "S/MIME şifreli içerik oluşturulamıyor."
-
-msgid "Could not create a S/MIME envelope context."
-msgstr "S/MIME şifreli zarf içeriği oluşturulamıyor."
-
-msgid "Could not create a S/MIME signature context."
-msgstr "S/MIME imzası oluşturulamadı."
-
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
-"e-posta bilgilerinizi girmediniz."
-
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"%s dizini yaratılamadı:\n"
-"%s"
-
-msgid "Could not create directory %s: %s"
-msgstr "%s dizini yaratılamadı: %s"
-
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"`%s' dosyası yaratılamadı:\n"
-"%s"
-
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"'%s dizini yaratılamadı:\n"
-"%s"
-
-msgid "Could not create lock file for %s: %s"
-msgstr "%s için kilitleme dosyası oluşturulamadı: %s"
-
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "sendmail ile bağlantı kurulamadı: %s: ileti gönderilemedi"
-
-msgid "Could not create pipe: %s"
-msgstr "Boru yaratılamadı: %s"
-
-msgid "Could not create temporary directory: %s"
-msgstr "Geçici dizin yaratılamadı: %s"
-
-msgid "Could not create the alarm notify service"
-msgstr "Alarm bilgilendirme servisi oluşturamadım"
-
-msgid "Could not create the alarm notify service factory"
-msgstr "Alarm bilgilendirme servis mimarisi oluşturamadım"
-
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
-
-msgid "Could not create the component editor factory"
-msgstr "Bileşen düzenleyici mimarisi oluşturulamadı."
-
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
-
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"`%s' dizini silinemedi:\n"
-"%s"
-
-msgid "Could not delete folder `%s': %s"
-msgstr "`%s' dizini silinemedi: %s"
-
-msgid "Could not delete folder index file `%s': %s"
-msgstr "`%s' dizin indeks dosyası silinemedi: %s"
-
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "`%s' dizin özet dosyası silinemedi: %s"
-
-msgid "Could not execute %s: mail not sent."
-msgstr "%s çalıştırılamadı: ileti gönderilemedi."
-
-msgid "Could not fetch message: %s"
-msgstr "İleti alınamadı: %s"
-
-msgid "Could not find 'From' address in message"
-msgstr "İleti gövdesinde 'Gönderen' adresi bulunamadı"
-
-msgid "Could not find message body in FETCH response."
-msgstr "FETCH cevabında ileti gövdesi bulunamadı"
-
-msgid "Could not find widget for a field: `%s'"
-msgstr "Bir alan için parçacık bulunamadı: `%s'"
-
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "sendmail çalıştırılamadı: %s: ileti gönderilemedi"
-
-msgid "Could not fork: %s"
-msgstr "Çatallama yapılamadı: %s"
-
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos bileti alınamadı:\n"
-"%s"
-
-msgid "Could not get group list from server."
-msgstr "Sunucudan grup listesi alınamadı."
-
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo'yu başlatamadım"
-
-msgid "Could not initialize GNOME"
-msgstr "GNOME başlatılamıyor"
-
-msgid "Could not initialize gnome-vfs"
-msgstr "Gnome-vfs başlatılamıyor"
-
-msgid "Could not load %s: %s"
-msgstr "%s yüklenemedi: %s"
-
-msgid "Could not load %s: Module loading not supported on this system."
-msgstr "%s yüklenemedi: Bu sistemde modül yükleneme desteklenmiyor."
-
-msgid "Could not load %s: No initialization code in module."
-msgstr "%s yüklenemedi: Modülde başlangıç kodu bulunamadı"
-
-msgid "Could not load summary for %s"
-msgstr "%s için özet bilgisi yüklenemedi"
-
-msgid "Could not load the tasks in `%s'"
-msgstr "%s içindeki görevler yüklenemedi."
-
-msgid "Could not lock '%s'"
-msgstr "%s kilitlenemedi"
-
-msgid ""
-"Could not open `%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"`%s' açılamadı:\n"
-"%s\n"
-"Bu dizine yapılacak değişiklikler senkronize edilmeyecektir."
-
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-"`%s' açılamadı. Takvim dizininden görevler dizinine gönderilecek öğe "
-"bulunmuyor."
-
-msgid "Could not open cache directory: %s"
-msgstr "Önbellek dizini yaratılamadı: %s"
-
-msgid "Could not open directory for news server: %s"
-msgstr "Haber grubu sunucusu için dizin açılamadı: %s"
-
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"`%s' dosyası açılamadı:\n"
-"%s"
-
-msgid "Could not open file: %s: %s"
-msgstr "%s dosyası açılamadı: %s"
-
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Dizin açılamadı: `%s':\n"
-"%s"
-
-msgid "Could not open folder: %s: %s"
-msgstr "Dizin açılamadı: `%s': %s"
-
-msgid "Could not open mail file %s: %s"
-msgstr "E-posta dosyası %s açılamadı: %s"
-
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Geçici e-posta dosyası %s açılamadı: %s"
-
-msgid "Could not open the folder in '%s'"
-msgstr "`%s' dizini açılamadı."
-
-msgid "Could not open the folder in `%s'"
-msgstr "`%s' dizini açılamadı."
-
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
-
-msgid "Could not parse URL `%s'"
-msgstr "URL açılamadı: %s"
-
-msgid "Could not read pilot's Address application block"
-msgstr "Pilot adres uygulama defteri okunamadı"
-
-msgid "Could not read pilot's Calendar application block"
-msgstr "Pilot'tan takvim uygulama bloğu okunamadı"
-
-msgid "Could not read pilot's ToDo application block"
-msgstr "Pilot ToDO uygulama bloğu okunamadı"
-
-msgid "Could not rename folder %s to %s: %s"
-msgstr "%s dizininin adı %s olarak değiştirilemedi: %s"
-
-msgid "Could not rename folder: %s"
-msgstr "Dizinin adı değiştirilemedi: %s"
-
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
-
-msgid "Could not save signature file."
-msgstr "İmza dosyası kaydedilemedi."
-
-msgid "Could not save summary: %s: %s"
-msgstr "Özet kaydedilemedi: %s: %s"
-
-msgid "Could not scan folder `%s': %s"
-msgstr "'%s dizini taranamadı: %s"
-
-msgid "Could not send message: %s"
-msgstr "İleti gönderilemedi: %s"
-
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Evolution Posta Asistanı arayüzü başlatılamadı\n"
-
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Evolution Posta Asistanı arayüzü başlatılamadı\n"
-"(%s)"
-
-msgid "Could not start wombat"
-msgstr "Wombat başlatılamadı"
-
-msgid "Could not start wombat server"
-msgstr "wombat sunucusu başlatılamadı"
-
-msgid "Could not update files correctly"
-msgstr "Dosyalar düzgün bir şekilde güncellenemedi"
-
-msgid "Could not update object!"
-msgstr "Nesne güncellenemedi"
-
-msgid "Could not write data: %s"
-msgstr "Veri yazılamadı: %s."
-
+#: my-evolution/Locations.h:519
 msgid "Council Bluffs"
 msgstr "Council Bluffs"
 
-msgid "Countr_y:"
-msgstr "Ü_lke:"
-
+#: my-evolution/Locations.h:520
 msgid "Coventry"
 msgstr "Coventry"
 
+#: my-evolution/Locations.h:521
 msgid "Covington"
 msgstr "Covington"
 
+#: my-evolution/Locations.h:522
 msgid "Cozumel"
 msgstr "Cozumel"
 
+#: my-evolution/Locations.h:523
 msgid "Craig"
 msgstr "Craig"
 
+#: my-evolution/Locations.h:524
 msgid "Cranfield"
 msgstr "Cranfield"
 
-msgid "Create Ru_le From Message"
-msgstr "_Bu İletiden Bir Kural Yarat"
-
-msgid "Create _New Folder..."
-msgstr "Yeni Bir _Dizin Yarat..."
-
-msgid "Create _Virtual Folder From Message"
-msgstr "İletiden _Sanal Dizin Yarat"
-
-msgid "Create a New All Day _Event"
-msgstr "Y_eni Tüm Gün Olayı Oluştur"
-
-msgid "Create a New _Task"
-msgstr "Yeni _Bir Görev Oluştur"
-
-msgid "Create a _New Appointment"
-msgstr "Y_eni Bir Randevu Oluştur"
-
-msgid "Create a link to this folder in the shortcut bar"
-msgstr "Kısayol çubuğunda bu dizine bir bağlantı oluştur"
-
-msgid "Create a new appointment"
-msgstr "Yeni bir randevu oluştur"
-
-msgid "Create a new contact \"%s\""
-msgstr "Yeni bir bağlantı yarat: \"%s\""
-
-msgid "Create a new folder"
-msgstr "Yeni bir dizin yarat"
-
-msgid "Create a new shortcut"
-msgstr "Yeni bir kısayol yarat"
-
-msgid "Create a new shortcut group"
-msgstr "Yeni bir kısayol grubu yarat"
-
-msgid "Create a new task"
-msgstr "Yeni bir görev oluştur"
-
-msgid "Create a rule to filter messages from this sender"
-msgstr "Bu gönderene göre iletileri filtrelemek için kural yarat"
-
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Bu alıcılara göre iletileri filtrelemek için kural yarat"
-
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Bu e-posta listesine göre iletileri filtrelemek için kural yarat"
-
-msgid "Create a rule to filter messages with this subject"
-msgstr "Bu konuyla iletileri filtrelemek için kural oluştur"
-
-msgid "Create a virtual folder for these recipients"
-msgstr "Bu alıcılar için bir sanal dizin yarat"
-
-msgid "Create a virtual folder for this mailing list"
-msgstr "Bu e-posta listesi için bir sanal dizin yarat"
-
-msgid "Create a virtual folder for this sender"
-msgstr "Bu gönderen için bir sanal dizin yarat"
-
-msgid "Create a virtual folder for this subject"
-msgstr "Bu konu için bir sanal dizin yarat"
-
-msgid "Create an event for the whole day"
-msgstr "Tüm gün için bir olay oluştur"
-
-msgid "Create new contact"
-msgstr "Yeni bir bağlantı yarat"
-
-msgid "Create new contact list"
-msgstr "Yeni bir bağlantı listesi yarat"
-
-msgid "Create new shortcut group"
-msgstr "Yeni bir kısayol grubu yarat"
-
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Posta hesaplarını ya da diğer tercihleri düzenle"
-
-msgid "Create or edit rules for filtering new mail"
-msgstr "Yeni iletileri süzmek için kural oluştur"
-
-msgid "Create or edit virtual folder definitions"
-msgstr "Sanal dizin tanımları oluştur/düzenle"
-
-msgid "Create vFolder from Search"
-msgstr "Aramadan _Sanal Dizin Yarat"
-
+#: my-evolution/Locations.h:525
 msgid "Crescent City"
 msgstr "Crescent City"
 
+#: my-evolution/Locations.h:526
 msgid "Creston"
 msgstr "Creston"
 
+#: my-evolution/Locations.h:527
 msgid "Crestview"
 msgstr "Crestview"
 
-msgid "Croatia"
-msgstr "Hırvatistan"
-
+#: my-evolution/Locations.h:529
 msgid "Cross City"
 msgstr "Cross City"
 
+#: my-evolution/Locations.h:530
 msgid "Crossville"
 msgstr "Crossville"
 
+#: my-evolution/Locations.h:531
 msgid "Crotone"
 msgstr "Crotone"
 
-msgid "Cu_t"
-msgstr "K_es"
-
-msgid "Cuba"
-msgstr "Küba"
-
+#: my-evolution/Locations.h:533
 msgid "Cuba Awrs"
 msgstr "Cuba Awrs"
 
+#: my-evolution/Locations.h:534
 msgid "Cuernavaca"
 msgstr "Cuernavaca"
 
+#: my-evolution/Locations.h:535
 msgid "Cuiaba"
 msgstr "Cuiaba"
 
+#: my-evolution/Locations.h:536
 msgid "Culdrose"
 msgstr "Culdrose"
 
+#: my-evolution/Locations.h:537
 msgid "Culiacan"
 msgstr "Culiacan"
 
+#: my-evolution/Locations.h:538
 msgid "Cumana"
 msgstr "Cumana"
 
+#: my-evolution/Locations.h:539
 msgid "Cumberland"
 msgstr "Cumberland"
 
+#: my-evolution/Locations.h:540
 msgid "Curitiba"
 msgstr "Curitiba"
 
+#: my-evolution/Locations.h:541
 msgid "Curitiba Apt"
 msgstr "Curitiba Apt"
 
-msgid "Current store format:"
-msgstr "Güncel depolama biçimi:"
-
-msgid "Cursor could not be loaded\n"
-msgstr "İmleç yüklenemedi\n"
-
+#: my-evolution/Locations.h:542
 msgid "Custer"
 msgstr "Custer"
 
-msgid "Customise My Evolution"
-msgstr "Evolution'ı Özelleştir"
-
-msgid "Cut"
-msgstr "Kes"
-
+#: my-evolution/Locations.h:543
 msgid "Cut Bank"
 msgstr "Cut Bank"
 
-msgid "Cut selected messages"
-msgstr "Seçili iletileri kes"
-
-msgid "Cut selected task"
-msgstr "Seçili Görevi Sil"
-
-msgid "Cut the selection"
-msgstr "Seçimi kes"
-
+#: my-evolution/Locations.h:544
 msgid "Cuzco"
 msgstr "Cuzco"
 
-msgid "Cyprus"
-msgstr "Kıbrıs"
-
-msgid "Cyrillic"
-msgstr "Kiril"
-
-msgid "Czech Republic"
-msgstr "Çek Cumhuriyeti"
-
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "DATA isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
-
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
-
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "DATA gönderimi zaman aşımına uğradı: %s: ileti gönderilmedi"
-
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "DATA gönderimi zaman aşımına uğradı: %s: ileti gönderilmedi"
-
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-msgid "D_epartment:"
-msgstr "_Bölüm:"
-
-msgid "Da Nang"
-msgstr "Da Nang"
-
+#: my-evolution/Locations.h:547
 msgid "Dagali"
 msgstr "Dagali"
 
+#: my-evolution/Locations.h:548
 msgid "Daggett"
 msgstr "Daggett"
 
+#: my-evolution/Locations.h:549
 msgid "Dalhart"
 msgstr "Dalhart"
 
+#: my-evolution/Locations.h:550
 msgid "Dalian"
 msgstr "Dalian"
 
+#: my-evolution/Locations.h:551
 msgid "Dallas-Addison"
 msgstr "Dallas-Addison"
 
+#: my-evolution/Locations.h:552
 msgid "Dallas-Fort Worth"
 msgstr "Dallas-Fort Worth"
 
+#: my-evolution/Locations.h:553
 msgid "Dallas-Love Field"
 msgstr "Dallas-Love Field"
 
+#: my-evolution/Locations.h:554
 msgid "Dallas-Redbird"
 msgstr "Dallas-Redbird"
 
+#: my-evolution/Locations.h:555
+msgid "Da Nang"
+msgstr "Da Nang"
+
+#: my-evolution/Locations.h:556
 msgid "Danbury"
 msgstr "Danbury"
 
+#: my-evolution/Locations.h:557
 msgid "Danville"
 msgstr "Danville"
 
+#: my-evolution/Locations.h:558
 msgid "Dar-El-Beida"
 msgstr "Dar-El-Beida"
 
-msgid "Date"
-msgstr "Tarih"
-
-msgid "Date & Time"
-msgstr "Tarih & Zaman"
-
-msgid "Date Completed:"
-msgstr "Tamamlama Tarihi:"
-
-msgid "Date received"
-msgstr "Alınma tarihi"
-
-msgid "Date sent"
-msgstr "Gönderilme tarihi"
-
-msgid "Date/Time:"
-msgstr "Tarih/Zaman:"
-
-msgid "Date:"
-msgstr "Tarih:"
-
+#: my-evolution/Locations.h:559
 msgid "Davenport"
 msgstr "Davenport"
 
+#: my-evolution/Locations.h:560
 msgid "David"
 msgstr "David"
 
+#: my-evolution/Locations.h:561
 msgid "Dawadmi"
 msgstr "Dawadmi"
 
-msgid "Day"
-msgstr "Gün"
-
-msgid "Day View"
-msgstr "Gün Görünümü"
-
-msgid "Days"
-msgstr "Gün"
-
+#: my-evolution/Locations.h:562
 msgid "Dayton"
 msgstr "Dayton"
 
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr "Daytona Beach"
+
+#: my-evolution/Locations.h:564
 msgid "Dayton-Fairborn"
 msgstr "Dayton-Fairborn"
 
+#: my-evolution/Locations.h:565
 msgid "Dayton-South Airport"
 msgstr "Dayton-South Airport"
 
-msgid "Daytona Beach"
-msgstr "Daytona Beach"
-
-msgid "De_fault"
-msgstr "Ö_ntanımlı"
-
-msgid "De_lete"
-msgstr "_Sil"
-
+#: my-evolution/Locations.h:566
 msgid "Dead Horse"
 msgstr "Dead Horse"
 
+#: my-evolution/Locations.h:567
 msgid "Deauville-Saint-Gatien"
 msgstr "Deauville-Saint-Gatien"
 
+#: my-evolution/Locations.h:568
 msgid "Decatur"
 msgstr "Decatur"
 
-msgid "December"
-msgstr "Eylül"
-
+#: my-evolution/Locations.h:569
 msgid "Decimomannu"
 msgstr "Decimomannu"
 
-msgid "Decline"
-msgstr "Reddet"
-
-msgid "Declined"
-msgstr "Reddedildi"
-
+#: my-evolution/Locations.h:570
 msgid "Decorah"
 msgstr "Decorah"
 
-msgid "Decrease the text size"
-msgstr "Metin boyunu azalt"
-
-msgid "Decryption is not supported by this cipher"
-msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
-
+#: my-evolution/Locations.h:571
 msgid "Deelen"
 msgstr "Deelen"
 
-msgid "Default"
-msgstr "Öntanımlı"
-
-msgid "Default Forward style is: "
-msgstr "Öntanımlı _Yönlendirme biçemi: "
-
-msgid "Default character encoding: "
-msgstr "Ö_ntanımlı karakter kümesi: "
-
-msgid "Define Views"
-msgstr "Görünümleri Tanımla"
-
+#: my-evolution/Locations.h:572
 msgid "Dekalb/Peachtree"
 msgstr "Dekalb/Peachtree"
 
+#: my-evolution/Locations.h:573
+msgid "Delaware"
+msgstr "Delaware"
+
+#: my-evolution/Locations.h:574
 msgid "Del Bajio"
 msgstr "Del Bajio"
 
+#: my-evolution/Locations.h:575
 msgid "Del Rio"
 msgstr "Del Rio"
 
-msgid "Delaware"
-msgstr "Delaware"
-
-msgid "Delegate To:"
-msgstr "Dağıt:"
-
-msgid "Delete"
-msgstr "Sil"
-
-msgid "Delete \"%s\""
-msgstr "Sil: \"%s\""
-
-msgid "Delete Contact?"
-msgstr "Bağlantıyı Sil?"
-
-msgid "Delete _All Occurrences"
-msgstr "_Tüm Oluşumları Sil"
-
-msgid "Delete after %s day(s)"
-msgstr "%s günden sonra sil"
-
-msgid "Delete all but signature"
-msgstr "İmza dışında tümünü sil"
-
-msgid "Delete selected contacts"
-msgstr "Seçili bağlantıları sil"
-
-msgid "Delete selected tasks"
-msgstr "Seçilen görevleri sil"
-
-msgid "Delete the appointment"
-msgstr "Randevuyu sil"
-
-msgid "Delete this _Occurrence"
-msgstr "_Bu Oluşumu Sil"
-
-msgid "Delete this folder"
-msgstr "Bu dizini sil"
-
-msgid "Delete this item"
-msgstr "Bu öğeyi sil"
-
-msgid "Delete this list"
-msgstr "Bu listeyi sil"
-
-msgid "Delete..."
-msgstr "Sil..."
-
-msgid "Deleted"
-msgstr "Silinen"
-
-msgid "Deleting selected objects"
-msgstr "Seçilen bağlantılar siliniyor"
-
+#: my-evolution/Locations.h:576
 msgid "Delta"
 msgstr "Delta"
 
+#: my-evolution/Locations.h:577
 msgid "Deming"
 msgstr "Deming"
 
+#: my-evolution/Locations.h:578
 msgid "Den Helder/De Kooy"
 msgstr "Den Helder/De Kooy"
 
+#: my-evolution/Locations.h:579
 msgid "Denison"
 msgstr "Denison"
 
-msgid "Denmark"
-msgstr "Danimarka"
-
+#: my-evolution/Locations.h:581
 msgid "Denton"
 msgstr "Denton"
 
+#: my-evolution/Locations.h:582
 msgid "Denver"
 msgstr "Denver"
 
+#: my-evolution/Locations.h:583
 msgid "Denver-Aurora"
 msgstr "Denver-Aurora"
 
+#: my-evolution/Locations.h:584
 msgid "Denver-Broomfield"
 msgstr "Denver-Broomfield"
 
+#: my-evolution/Locations.h:585
 msgid "Denver-Cherry Knolls"
 msgstr "Denver-Cherry Knolls"
 
-msgid "Dep"
-msgstr "Böl"
-
-msgid "Department"
-msgstr "Bölüm"
+#: my-evolution/Locations.h:586
+msgid "Desert Rock"
+msgstr "Desert Rock"
 
+#: my-evolution/Locations.h:587
 msgid "Des Moines"
 msgstr "Des Moines"
 
-msgid "Description contains"
-msgstr "Açıklama içeriği"
-
-msgid "Description:"
-msgstr "Açıklama:"
-
-msgid "Desert Rock"
-msgstr "Desert Rock"
-
+#: my-evolution/Locations.h:588
 msgid "Destin"
 msgstr "Destin"
 
-msgid "Details"
-msgstr "Ayrıntılar"
-
+#: my-evolution/Locations.h:589
 msgid "Detroit"
 msgstr "Detroit"
 
+#: my-evolution/Locations.h:590
 msgid "Detroit Lakes"
 msgstr "Detroit Lakes"
 
+#: my-evolution/Locations.h:591
 msgid "Detroit-Taylor"
 msgstr "Detroit-Taylor"
 
+#: my-evolution/Locations.h:592
 msgid "Detroit/Ypsilanti"
 msgstr "Detroit/Ypsilanti"
 
+#: my-evolution/Locations.h:593
 msgid "Devils Lake"
 msgstr "Devils Lake"
 
+#: my-evolution/Locations.h:594
 msgid "Devils Lake (2)"
 msgstr "Devils Lake (2)"
 
+#: my-evolution/Locations.h:595
 msgid "Dhahran"
 msgstr "Dhahran"
 
+#: my-evolution/Locations.h:596
 msgid "Dickinson"
 msgstr "Dickinson"
 
-msgid "Digital IDs..."
-msgstr "Sayısal Numaralar..."
-
+#: my-evolution/Locations.h:597
 msgid "Dijon"
 msgstr "Dijon"
 
+#: my-evolution/Locations.h:598
 msgid "Dillingham"
 msgstr "Dillingham"
 
+#: my-evolution/Locations.h:599
 msgid "Dillon"
 msgstr "Dillon"
 
-msgid "Dimensions:"
-msgstr "Boyutlar:"
-
+#: my-evolution/Locations.h:600
 msgid "Dinard"
 msgstr "Dinard"
 
-msgid "Disable"
-msgstr "Kapat"
-
-msgid "Disable Queries"
-msgstr "Aramaları Kapat"
-
-msgid "Disable splash screen"
-msgstr "Açılış ekranıni gösterme"
-
-msgid "Disconnecting from %s"
-msgstr "%s bağlantısı kesiliyor"
-
-msgid "Display"
-msgstr "Görüntüleme"
-
-msgid "Display a different folder"
-msgstr "Farklı bir dizin göster"
-
-msgid "Display a message"
-msgstr "Bir mesaj göster"
-
-msgid "Display options"
-msgstr "Görüntüleme seçenekleri"
-
-msgid "Display the next important message"
-msgstr "Sonraki önemli iletiyi göster"
-
-msgid "Display the next message"
-msgstr "Sonraki iletiyi göster"
-
-msgid "Display the next unread message"
-msgstr "Sonraki okunmamış iletiyi göster"
-
-msgid "Display the next unread thread"
-msgstr "Sonraki okunmamış konumu göster"
-
-msgid "Display the previous important message"
-msgstr "Önceki önemli iletiyi göster"
-
-msgid "Display the previous message"
-msgstr "Önceki iletiyi göster"
-
-msgid "Display the previous unread message"
-msgstr "Önceki okunmamış iletiyi göster"
-
+#: my-evolution/Locations.h:601
 msgid "District of Columbia"
 msgstr "District of Columbia"
 
+#: my-evolution/Locations.h:602
 msgid "Diyarbakir"
 msgstr "Diyarbakır"
 
-msgid "Djibouti"
-msgstr "Cibuti"
-
-msgid "Do Not Exist"
-msgstr "Bulunmaz"
-
-msgid "Do not ask me again."
-msgstr "Tekrar sorma."
-
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+#: my-evolution/Locations.h:603
+msgid "Dnipropetrovsk"
 msgstr ""
-"Kısayol çubuğundan `%s' grubunu \n"
-"kaldırmak istiyor musunuz?"
-
-msgid "Do you want to save changes?"
-msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
 
+#: my-evolution/Locations.h:604
 msgid "Dobbiaco"
 msgstr "Dobbiaco"
 
+#: my-evolution/Locations.h:605
 msgid "Dodge City"
 msgstr "Dodge City"
 
+#: my-evolution/Locations.h:606
 msgid "Doha"
 msgstr "Doha"
 
+#: my-evolution/Locations.h:607
 msgid "Dole"
 msgstr "Dole"
 
-msgid "Dominica"
-msgstr "Dominik"
-
-msgid "Dominican Republic"
-msgstr "Dominik Cumhuriyeti"
-
-msgid "Don Torcuato"
-msgstr "Don Torcuato"
-
-msgid "Don't ask me again"
-msgstr "Tekrar sorma"
-
-msgid "Don't delete"
-msgstr "Silme"
-
-msgid "Don't import"
-msgstr "Alma"
-
-msgid "Don't remove"
-msgstr "Silme"
-
-msgid "Don't show this message again."
-msgstr "Bu mesajı bir daha gösterme."
-
-msgid "Done"
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
 msgstr "Tamamlandı"
 
+#: my-evolution/Locations.h:610
 msgid "Dongsha"
 msgstr "Dongsha"
 
+#: my-evolution/Locations.h:611
 msgid "Dongshi"
 msgstr "Dongshi"
 
+#: my-evolution/Locations.h:612
+msgid "Don Torcuato"
+msgstr "Don Torcuato"
+
+#: my-evolution/Locations.h:613
 msgid "Dortmund-Wickede"
 msgstr "Dortmund-Wickede"
 
+#: my-evolution/Locations.h:614
 msgid "Dothan"
 msgstr "Dothan"
 
+#: my-evolution/Locations.h:615
 msgid "Douglas"
 msgstr "Douglas"
 
+#: my-evolution/Locations.h:616
 msgid "Dover"
 msgstr "Dover"
 
-msgid "Dr."
-msgstr "Dr."
-
-msgid "Draft"
-msgstr "Taslak"
-
-msgid "Drafts"
-msgstr "Taslaklar"
-
+#: my-evolution/Locations.h:617
 msgid "Dresden-Klotzsche"
 msgstr "Dresden-Klotzsche"
 
+#: my-evolution/Locations.h:618
 msgid "Drummond"
 msgstr "Drummond"
 
-msgid "Du Bois"
-msgstr "Du Bois"
-
+#: my-evolution/Locations.h:619
 msgid "Dubai"
 msgstr "Dubai"
 
+#: my-evolution/Locations.h:620
 msgid "Dubbo"
 msgstr "Dubbo"
 
+#: my-evolution/Locations.h:621
 msgid "Dublin"
 msgstr "Dublin"
 
+#: my-evolution/Locations.h:622
+msgid "Du Bois"
+msgstr "Du Bois"
+
+#: my-evolution/Locations.h:623
 msgid "Dubrovnik"
 msgstr "Dubrovnik"
 
+#: my-evolution/Locations.h:624
 msgid "Dubuque"
 msgstr "Dubuque"
 
-msgid "Due "
-msgstr "Tarihe göre "
-
-msgid "Due Date"
-msgstr "Tarihe göre:"
-
+#: my-evolution/Locations.h:625
 msgid "Dugway"
 msgstr "Dugway"
 
+#: my-evolution/Locations.h:626
 msgid "Duluth"
 msgstr "Duluth"
 
+#: my-evolution/Locations.h:627
 msgid "Dundee"
 msgstr "Dundee"
 
-msgid "Duplicate Contact Detected"
-msgstr "Çift Bağlantı Bulundu"
-
+#: my-evolution/Locations.h:628
 msgid "Durango"
 msgstr "Durango"
 
+#: my-evolution/Locations.h:629
 msgid "Durango Awrs"
 msgstr "Durango Awrs"
 
+#: my-evolution/Locations.h:630
 msgid "Durazno"
 msgstr "Durazno"
 
+#: my-evolution/Locations.h:631
 msgid "Durban Louis Botha "
 msgstr "Durban Louis Botha "
 
+#: my-evolution/Locations.h:632
 msgid "Dusseldorf"
 msgstr "Dusseldorf"
 
-msgid "Dust"
-msgstr "Toz"
-
-msgid "Duststorm"
-msgstr "Toz fırtınası"
-
+#: my-evolution/Locations.h:633
 msgid "Dutch Harbor"
 msgstr "Dutch Harbor"
 
+#: my-evolution/Locations.h:634
 msgid "Dyersburg"
 msgstr "Dyersburg"
 
-msgid "E"
-msgstr "D"
-
-msgid "E-mail"
-msgstr "E-posta"
-
-msgid "EBook not loaded\n"
-msgstr "EBook yüklenmedi\n"
-
-msgid "E_nable"
-msgstr "_Etkinleştir"
-
-msgid "E_xit"
-msgstr "Çı_k"
-
+#: my-evolution/Locations.h:635
 msgid "Eagle"
 msgstr "Eagle"
 
+#: my-evolution/Locations.h:636
 msgid "Eagle Range"
 msgstr "Eagle Range"
 
-msgid "East"
-msgstr "Doğu"
-
-msgid "East - NorthEast"
-msgstr "Doğu - Kuzeydoğu"
-
-msgid "East - Southeast"
-msgstr "Doğu - Güneydoğu"
-
+#: my-evolution/Locations.h:637
 msgid "East London"
 msgstr "East London"
 
+#: my-evolution/Locations.h:638
 msgid "East Midlands"
 msgstr "East Midlands"
 
+#: my-evolution/Locations.h:639
 msgid "East St Louis"
 msgstr "East St Louis"
 
-msgid "East Timor"
-msgstr "Doğu Timur"
-
+#: my-evolution/Locations.h:640
 msgid "Eau Claire"
 msgstr "Eau Claire"
 
-msgid "Ecuador"
-msgstr "Ekvator"
-
+#: my-evolution/Locations.h:642
 msgid "Edinburgh"
 msgstr "Edinburgh"
 
-msgid "Edit Addressbook"
-msgstr "Adres Defterini Düzenle"
-
-msgid "Edit Appointment"
-msgstr "Randevuyu Düzenle"
-
-msgid "Edit Contact Info"
-msgstr "Bağlantı Bilgisini Düzenle"
-
-msgid "Edit Contact List"
-msgstr "Bağ_lantı Listesini Düzenle"
-
-msgid "Edit Filters"
-msgstr "Filtreleri Düzenle"
-
-msgid "Edit Full"
-msgstr "Tümünü Düzenle"
-
-msgid "Edit Rule"
-msgstr "Görev Düzenle"
-
-msgid "Edit VFolder"
-msgstr "VDizin Düzenle"
-
-msgid "Edit VFolders"
-msgstr "VFolder Düzenle"
-
-msgid "Edit..."
-msgstr "Düzenle..."
-
+#: my-evolution/Locations.h:643
 msgid "Edmonton"
 msgstr "Edmonton"
 
+#: my-evolution/Locations.h:644
 msgid "Edmonton/Villeneuve"
 msgstr "Edmonton/Villeneuve"
 
+#: my-evolution/Locations.h:645
 msgid "Eduardo Gomes International"
 msgstr "Eduardo Gomes International"
 
+#: my-evolution/Locations.h:646
 msgid "Edwards AFB"
 msgstr "Edwards AFB"
 
+#: my-evolution/Locations.h:647
 msgid "Egilsstadir"
 msgstr "Egilsstadir"
 
+#: my-evolution/Locations.h:648
 msgid "Eglin"
 msgstr "Eglin"
 
+#: my-evolution/Locations.h:649
 msgid "Eglington/Londonderry"
 msgstr "Eglington/Londonderry"
 
-msgid "Egypt"
-msgstr "Mısır"
-
+#: my-evolution/Locations.h:651
 msgid "Eindhoven"
 msgstr "Eindhoven"
 
+#: my-evolution/Locations.h:652
 msgid "Ekofisk"
 msgstr "Ekofisk"
 
+#: my-evolution/Locations.h:653
+msgid "Elazig"
+msgstr "Elazığ"
+
+#: my-evolution/Locations.h:654
 msgid "El Centro"
 msgstr "El Centro"
 
+#: my-evolution/Locations.h:655
 msgid "El Dorado"
 msgstr "El Dorado"
 
-msgid "El Monte"
-msgstr "El Monte"
-
-msgid "El Paso"
-msgstr "El Paso"
-
-msgid "El Salvador"
-msgstr "El Salvador"
-
-msgid "El Salvador Int."
-msgstr "El Salvador Int."
-
-msgid "Elazig"
-msgstr "Elazığ"
-
+#: my-evolution/Locations.h:656
 msgid "Elefsis"
 msgstr "Elefsis"
 
+#: my-evolution/Locations.h:657
 msgid "Elfin Cove"
 msgstr "Elfin Cove"
 
+#: my-evolution/Locations.h:658
 msgid "Elizabeth City"
 msgstr "Elizabeth City"
 
+#: my-evolution/Locations.h:659
 msgid "Elk City"
 msgstr "Elk City"
 
+#: my-evolution/Locations.h:660
 msgid "Elkhart"
 msgstr "Elkhart"
 
+#: my-evolution/Locations.h:661
 msgid "Elkins"
 msgstr "Elkins"
 
+#: my-evolution/Locations.h:662
 msgid "Elko"
 msgstr "Elko"
 
-msgid "Elm"
-msgstr "Elm"
-
+#: my-evolution/Locations.h:663
 msgid "Elmira"
 msgstr "Elmira"
 
+#: my-evolution/Locations.h:664
+msgid "El Monte"
+msgstr "El Monte"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr "El Paso"
+
+#: my-evolution/Locations.h:667
+msgid "El Salvador Int."
+msgstr "El Salvador Int."
+
+#: my-evolution/Locations.h:668
 msgid "Elsenborn"
 msgstr "Elsenborn"
 
+#: my-evolution/Locations.h:669
 msgid "Ely"
 msgstr "Ely"
 
-msgid "Email"
-msgstr "E-posta"
-
-msgid "Email 2"
-msgstr "2. E-posta Adresi"
-
-msgid "Email 3"
-msgstr "3. E-posta Adresi"
-
-msgid "Email is"
-msgstr "E-posta adresi"
-
+#: my-evolution/Locations.h:670
 msgid "Emmonak"
 msgstr "Emmonak"
 
+#: my-evolution/Locations.h:671
 msgid "Emporia"
 msgstr "Emporia"
 
-msgid "Empty Message"
-msgstr "Boş İleti"
-
-msgid "Empty _Trash"
-msgstr "Çöpü _Boşalt"
-
-msgid "Enable"
-msgstr "Etkinleştir"
-
-msgid "Enable Queries (Dangerous!)"
-msgstr "Aramaları Etkinleştir (Tehlikeli!)"
-
-msgid "Enabled"
-msgstr "Etkin"
-
-msgid "Encrypt this message with PGP"
-msgstr "Bu iletiyi PGP ile şifrele"
-
-msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Bu iletiyi S/MIME şifreleme sertifikasıyla şifrele"
-
-msgid "Encryption is not supported by this cipher"
-msgstr "Bu şifre ile şifreleme desteklenmiyor"
-
-msgid "Encryption required for requested authentication mechanism"
-msgstr "İstenen kimlik sınama yöntemi için şifreleme gerekiyor"
-
-msgid "End Date"
-msgstr "Bitiş Tarihi"
-
-msgid "Ending:"
-msgstr "Bitiş:"
-
-msgid "Ends: <b>"
-msgstr "Bitiş: <b>"
-
+#: my-evolution/Locations.h:672
 msgid "Enid"
 msgstr "Enid"
 
+#: my-evolution/Locations.h:673
 msgid "Enid/Woodring"
 msgstr "Enid/Woodring"
 
+#: my-evolution/Locations.h:674
 msgid "Enosburg Falls"
 msgstr "Enosburg Falls"
 
-msgid "Enter Password"
-msgstr "Parolayı Girin"
-
-msgid "Enter Password for %s"
-msgstr "%s İçin Parolayı Girin"
-
-msgid "Enter password for %s (user %s)"
-msgstr "%s için parolayı girin (kullanıcı: %s)"
-
-msgid "Enter the URL of the news feed you wish to add"
-msgstr "Eklenecek haber grubunun adını buraya yazın"
-
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "İletinin kopyasının gönderilecek olunduğu adresler"
-
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"İletinin karbon kopyalarının gönderileceği adresi girin. Ancak buraya "
-"girilecek kişiler gönderilenler listesinde görünmeyecektir."
-
-msgid "Enter the character set to use"
-msgstr "Kullanılacak karakter setini girin"
-
-msgid "Enter the recipients of the message"
-msgstr "İletinin gönderildiği kişiler"
-
+#: my-evolution/Locations.h:675
 msgid "Ephrata"
 msgstr "Ephrata"
 
-msgid "Equatorial Guinea"
-msgstr "Equatorial Guinea"
-
+#: my-evolution/Locations.h:676
 msgid "Ercan"
 msgstr "Ercan"
 
+#: my-evolution/Locations.h:677
 msgid "Erie"
 msgstr "Erie"
 
-msgid "Eritrea"
-msgstr "Eritrea"
-
-msgid "Error"
-msgstr "Hata"
-
-msgid "Error accessing file: %s"
-msgstr "Dosyaya erişirken hata oldu: %s"
-
-msgid "Error adding card"
-msgstr "Kart eklenirken hata oluştu"
-
-msgid "Error adding list"
-msgstr "Liste eklenirken hata oluştu"
-
-msgid "Error copying mail temp file: %s"
-msgstr "Geçici mektup dosyasına yazarken hata: %s"
-
-msgid "Error creating SASL authentication object."
-msgstr "SASL kimlik denetim nesnesi yaratılamadı."
-
-msgid "Error downloading RDF"
-msgstr "RDF indirirken bir hata oluştu"
-
-msgid "Error executing %s."
-msgstr "%s çalıştırırken bir hata oldu."
-
-msgid "Error executing filter search: %s: %s"
-msgstr "%s filtre taramasını çalıştırırken hata oldu: %s"
-
-msgid "Error executing filter: %s: %s"
-msgstr "%s filtresini çalıştırırken hata oldu: %s"
-
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Arama deyimi çalıştırılamadı: %s:\n"
-"%s"
-
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"`%s' düzgün deyiminde hata var:\n"
-"%s"
-
-msgid "Error in search expression."
-msgstr "Arama ifadesinde hata."
-
-msgid "Error loading %s"
-msgstr "%s yüklenirken hata oluştu"
-
-msgid "Error loading default addressbook."
-msgstr "Öntanımlı adres defteri yüklenemedi."
-
-msgid "Error loading file: %s"
-msgstr "`%s' dosyasını yüklerken hata oldu"
-
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Filtre bilgisini yüklerken hata oluştu:\n"
-"%s"
-
-msgid "Error modifying card"
-msgstr "Kartlar düzenlenirken bir hata oluştu"
-
-msgid "Error modifying list"
-msgstr "Liste düzenlenirken hata oluştu"
-
-msgid "Error parsing filter: %s: %s"
-msgstr "%s filtresini ayrıştırırken hata oldu: %s"
-
-msgid "Error reading mail file: %s"
-msgstr "%s posta dosyasını okurken hata oluştu"
-
-msgid "Error removing card"
-msgstr "Kartı silerken bir hata oluştu"
-
-msgid "Error removing list"
-msgstr "Listeyi silerken bir hata oluştu"
-
-msgid "Error saving file: %s"
-msgstr "%s dosyasını kaydederken hata oldu"
-
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"İletilerin kaydında hata: %s:\n"
-" %s"
-
-msgid "Error saving shortcuts."
-msgstr "Kısayolları kaydederken hata oldu."
-
-msgid "Error starting %s"
-msgstr "%s başlatırken hata oluştu"
-
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"'%s' sırasında hata:\n"
-"%s"
-
-msgid "Error while communicating with calendar server"
-msgstr "Takvim sunucusuyla iletişimde hata oluştu"
-
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"İşlem sırasında hata:\n"
-"%s"
-
-msgid ""
-"Error while reading file %s:\n"
-"%s"
-msgstr ""
-"%s dosyasını yüklerken hata oldu:\n"
-"%s"
-
-msgid "Error writing mail temp file: %s"
-msgstr "Geçici mektup dosyasına yazarken hata: %s"
-
-msgid "Error writing to temp mailbox: %s"
-msgstr "Geçici posta kutusuna yazma hatası: %s"
-
+#: my-evolution/Locations.h:678
 msgid "Erzurum"
 msgstr "Erzurum"
 
+#: my-evolution/Locations.h:679
 msgid "Esbjerg"
 msgstr "Esbjerg"
 
+#: my-evolution/Locations.h:680
 msgid "Escanaba"
 msgstr "Escanaba"
 
+#: my-evolution/Locations.h:681
 msgid "Esfahan"
 msgstr "Esfahan"
 
+#: my-evolution/Locations.h:682
 msgid "Eskisehir"
 msgstr "Eskisehir"
 
-msgid "Esq."
-msgstr "Esq."
-
+#: my-evolution/Locations.h:683
 msgid "Estherville"
 msgstr "Estherville"
 
-msgid "Estonia"
-msgstr "Estonya"
-
-msgid "Ethiopia"
-msgstr "Etiyopya"
-
+#: my-evolution/Locations.h:685
 msgid "Eugene"
 msgstr "Eugene"
 
+#: my-evolution/Locations.h:686
 msgid "Eureka"
 msgstr "Eureka"
 
+#: my-evolution/Locations.h:687
 msgid "Europe"
 msgstr "Europe"
 
-msgid "Europe/Amsterdam"
-msgstr "Avrupa/Amsterdam"
-
-msgid "Europe/Andorra"
-msgstr "Avrupa/Andorra"
-
-msgid "Europe/Athens"
-msgstr "Avrupa/Athens"
-
-msgid "Europe/Belfast"
-msgstr "Avrupa/Belfast"
-
-msgid "Europe/Belgrade"
-msgstr "Avrupa/Belgrade"
-
-msgid "Europe/Berlin"
-msgstr "Avrupa/Berlin"
-
-msgid "Europe/Bratislava"
-msgstr "Avrupa/Bratislava"
-
-msgid "Europe/Brussels"
-msgstr "Avrupa/Brussels"
-
-msgid "Europe/Bucharest"
-msgstr "Avrupa/Bucharest"
-
-msgid "Europe/Budapest"
-msgstr "Avrupa/Budapest"
-
-msgid "Europe/Chisinau"
-msgstr "Avrupa/Chisinau"
-
-msgid "Europe/Copenhagen"
-msgstr "Avrupa/Copenhagen"
-
-msgid "Europe/Dublin"
-msgstr "Avrupa/Dublin"
-
-msgid "Europe/Gibraltar"
-msgstr "Avrupa/Gibraltar"
-
-msgid "Europe/Helsinki"
-msgstr "Avrupa/Helsinki"
-
-msgid "Europe/Istanbul"
-msgstr "Avrupa/İstanbul"
-
-msgid "Europe/Kaliningrad"
-msgstr "Avrupa/Kaliningrad"
-
-msgid "Europe/Kiev"
-msgstr "Avrupa/Kiev"
-
-msgid "Europe/Lisbon"
-msgstr "Avrupa/Lisbon"
-
-msgid "Europe/Ljubljana"
-msgstr "Avrupa/Ljubljana"
-
-msgid "Europe/London"
-msgstr "Avrupa/London"
-
-msgid "Europe/Luxembourg"
-msgstr "Avrupa/Luxembourg"
-
-msgid "Europe/Madrid"
-msgstr "Avrupa/Madrid"
-
-msgid "Europe/Malta"
-msgstr "Avrupa/Malta"
-
-msgid "Europe/Minsk"
-msgstr "Avrupa/Minsk"
-
-msgid "Europe/Monaco"
-msgstr "Avrupa/Monaco"
-
-msgid "Europe/Moscow"
-msgstr "Avrupa/Moscow"
-
-msgid "Europe/Nicosia"
-msgstr "Avrupa/Nicosia"
-
-msgid "Europe/Oslo"
-msgstr "Avrupa/Oslo"
-
-msgid "Europe/Paris"
-msgstr "Avrupa/Paris"
-
-msgid "Europe/Prague"
-msgstr "Avrupa/Prague"
-
-msgid "Europe/Riga"
-msgstr "Avrupa/Riga"
-
-msgid "Europe/Rome"
-msgstr "Avrupa/Rome"
-
-msgid "Europe/Samara"
-msgstr "Avrupa/Samara"
-
-msgid "Europe/San_Marino"
-msgstr "Avrupa/San_Marino"
-
-msgid "Europe/Sarajevo"
-msgstr "Avrupa/Sarajevo"
-
-msgid "Europe/Simferopol"
-msgstr "Avrupa/Simferopol"
-
-msgid "Europe/Skopje"
-msgstr "Avrupa/Skopje"
-
-msgid "Europe/Sofia"
-msgstr "Avrupa/Sofya"
-
-msgid "Europe/Stockholm"
-msgstr "Avrupa/Stockholm"
-
-msgid "Europe/Tallinn"
-msgstr "Avrupa/Tallinn"
-
-msgid "Europe/Tirane"
-msgstr "Avrupa/Tiran"
-
-msgid "Europe/Uzhgorod"
-msgstr "Avrupa/Uzhgorod"
-
-msgid "Europe/Vaduz"
-msgstr "Avrupa/Vaduz"
-
-msgid "Europe/Vatican"
-msgstr "Avrupa/Vatikan"
-
-msgid "Europe/Vienna"
-msgstr "Avrupa/Viyana"
-
-msgid "Europe/Vilnius"
-msgstr "Avrupa/Vilnius"
-
-msgid "Europe/Warsaw"
-msgstr "Avrupa/Varşova"
-
-msgid "Europe/Zagreb"
-msgstr "Avrupa/Zagreb"
-
-msgid "Europe/Zaporozhye"
-msgstr "Avrupa/Zaporozhye"
-
-msgid "Europe/Zurich"
-msgstr "Avrupa/Zurich"
-
+#: my-evolution/Locations.h:688
 msgid "Evanston"
 msgstr "Evanston"
 
+#: my-evolution/Locations.h:689
 msgid "Evansville"
 msgstr "Evansville"
 
-msgid "Event information"
-msgstr "Olay bilgisi"
-
+#: my-evolution/Locations.h:690
 msgid "Everett"
 msgstr "Everett"
 
+#: my-evolution/Locations.h:691
 msgid "Evergreen"
 msgstr "Evergreen"
 
-msgid "Every"
-msgstr "Her"
-
-msgid "Evolution"
-msgstr "Evolution"
-
-msgid "Evolution "
-msgstr "Evolution "
-
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Yeni bir dizin yarat"
-
-msgid "Evolution Account Assistant"
-msgstr "Evolution Hesap Sihirbazı"
-
-msgid "Evolution Account Editor"
-msgstr "Evolution Hesap Düzenleyici"
-
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution Adres Defteri mini kart görüntüleyici"
-
-msgid "Evolution Alarm"
-msgstr "Evolution Alarmı"
-
-msgid "Evolution Error"
-msgstr "Evolution Hatası"
-
-msgid "Evolution Import Assistant"
-msgstr "Evolution Aktarma Yardımcısı"
-
-msgid "Evolution Importer Assistant"
-msgstr "Evolution Aktarma Yardımcısı"
-
-msgid "Evolution News Editor"
-msgstr "Evolution Haber Grubu Düzenleyici"
-
-msgid "Evolution Setup Assistant"
-msgstr "Evolution Kurulum Yardımcısı"
-
-msgid "Evolution _Window"
-msgstr "Evolution _Penceresi"
-
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution takvim özet bileşeni."
-
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution takvimi iTip/iMip görüntüleyici"
-
-msgid "Evolution can import data from the following files:"
-msgstr "Evolution, aşağıdaki dosyalardan veri alabilir:"
-
-msgid "Evolution component for handling contacts."
-msgstr "Bağlantıları düzenleyen Evolution bileşeni."
-
-msgid "Evolution component for handling mail."
-msgstr "E-posta alma va gönderme için Evolution bileşeni"
-
-msgid "Evolution component for handling the calendar."
-msgstr "Takvimi düzenleyen Evolution bileşeni."
-
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution aşağıdaki dizini oluşturamadı:\n"
-"%s\n"
-"%s"
-
-msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution, Elm ileti dosyaları buldu.\n"
-"Bunları Evolution'a aktarmak ister misiniz?"
-
-msgid ""
-"Evolution has found GnomeCard files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution, GnomeCard dosyaları buldu.\n"
-"Bunların Evolution'a aktarılmasını istiyor musunuz?"
-
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution, Netscape e-posta dosyaları buldu.\n"
-"Bunların Evolution'a aktarılmasını istiyor musunuz?"
-
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution, Pine e-posta dosyaları buldu.\n"
-"Bunların Evolution'a aktarılmasını istiyor musunuz?"
-
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"Evolution takvim dizininde bulunan tüm görevleri görevler dizinine aktardı."
-
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"Evolution takvim dizininde bulunan görevleri yeni görevler dizinine "
-"göndermeyi denedi, ancak bazı görevler taşınamadı. Bu işlemi daha sonra "
-"tekrar deneyiniz."
-
-msgid "Evolution installation"
-msgstr "Evolution kurulumu"
-
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution, eski Elm iletilerinizi alıyor"
-
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution, Netscape verilerini alıyor."
-
-msgid "Evolution is importing your old Pine data"
-msgstr "Evolution, Pine'daki tüm verileri alıyor"
-
-msgid "Evolution is now exiting ..."
-msgstr "Evolution'dan çıkılıyor..."
-
-msgid "Evolution mail composer."
-msgstr "Evolution e-posta programı."
-
-msgid "Evolution mail executive summary component."
-msgstr "Evolution e-posta özet bileşeni."
-
-msgid "Evolution mail folder display component."
-msgstr "Evolution e-posta dizin görüntüleme bileşeni."
-
-msgid "Evolution mail folder factory component."
-msgstr "Evolution e-posta dizin bileşeni"
-
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution adres defteri isim seçme arayüzü."
-
+#: my-evolution/Locations.h:692
 msgid "Evreux-Fauville"
 msgstr "Evreux-Fauville"
 
-msgid "Exceptions"
-msgstr "İstisnalar"
-
-msgid "Execute actions"
-msgstr "Eylemleri işlet"
-
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Bonobo başlatılamadı.\n"
-
+#: my-evolution/Locations.h:693
 msgid "Exeter"
 msgstr "Exeter"
 
-msgid "Exist"
-msgstr "bulunur"
-
-msgid "Exists"
-msgstr "Bulunur"
-
-msgid "Exit the program"
-msgstr "Programdan çık"
-
-msgid "Expression"
-msgstr "Deyim"
-
-msgid "Expunging deleted messages"
-msgstr "Silinen iletiler çöpe gönderiliyor"
-
-msgid "Expunging folder"
-msgstr "Dizin siliniyor"
-
-msgid "External Viewer"
-msgstr "Harici İzleyici"
-
+#: my-evolution/Locations.h:694
 msgid "Ezeiza"
 msgstr "Ezeiza"
 
-msgid "FBUrl"
-msgstr "FBUrl"
-
-msgid "FYR Macedonia"
-msgstr "FYR Macedonia"
-
-msgid "F_ind"
-msgstr "_Bul:"
-
-msgid "F_older"
-msgstr "_Dizin"
-
-msgid "F_ont..."
-msgstr "_Yazıtipi..."
-
-msgid "F_ree"
-msgstr "_Boş"
-
-msgid "F_ree/Busy URL:"
-msgstr "_Boş/Meşgul URL:"
-
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Adres defteri mini kart mimarisi"
-
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Adres defteri isim gösterim arayüzü mimarisi"
-
-msgid "Factory for the Addressbook's address popup"
-msgstr "Adres defteri menüsü mimarisi"
-
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Adres defteri isim seçim arayüzü mimarisi"
-
-msgid "Factory for the Evolution composer."
-msgstr "Evolution e-posta programı mimarisi."
-
-msgid "Factory for the Mail Summary component."
-msgstr "E-posta özet bileşen mimarisi"
-
-msgid "Factory for the alarm notification service"
-msgstr "Alarm bilgilendirme servisi mimarisi"
-
-msgid "Factory for the calendar iTip view control"
-msgstr "Takvim iTip görüntü kontrolü mimarisi"
-
-msgid "Factory for the sample Addressbook control"
-msgstr "Örnek adres defteri kontrol mimarisi"
-
-msgid "Factory for the sample Calendar control"
-msgstr "Örnek Takvim kontrolü mimarisi"
-
-msgid "Factory to import LDIF files into Evolution."
-msgstr "LDIF dosyalarını Evolution'a aktarım mimarisi."
-
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Outlook Express 4 iletilerini Evolution'a aktarım mimarisi"
-
-msgid "Factory to import VCard files into Evolution."
-msgstr "VCard dosyalarını Evolution'a aktarım mimarisi."
-
-msgid "Factory to import mbox into Evolution"
-msgstr "Mbox dosyalarını Evolution'a aktarım mimarisi"
-
+#: my-evolution/Locations.h:695
 msgid "Fagernes"
 msgstr "Fagernes"
 
-msgid "Failed at message %d of %d"
-msgstr "%d/%d iletisinde hata"
-
-msgid "Failed on message %d"
-msgstr "%d iletisinde hata"
-
-msgid "Failed on message %d of %d"
-msgstr "%d/%d iletide hata"
-
-msgid "Failed to cache message %s: %s"
-msgstr "%s iletisi önbelleğe yazılamadı: %s"
-
-msgid "Failed to decode message."
-msgstr "İletinin açılmasında hata."
-
-msgid "Failed to find certificate for \"%s\"."
-msgstr "\"%s\" için sertifika bulunamadı."
-
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2) kullanılırken kilitleme hatası: %s"
-
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2) kullanılırken kilitleme hatası: %s"
-
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "%s geçici mektup dosyasını oluştururken hata: %s"
-
-msgid "Failed to verify certificates."
-msgstr "Sertifika denetlenemedi."
-
-msgid "Failure in name lookup: %s"
-msgstr "İsim çözümlemesinde hata: %s"
-
+#: my-evolution/Locations.h:696
 msgid "Fairbanks"
 msgstr "Fairbanks"
 
+#: my-evolution/Locations.h:697
 msgid "Fairchild"
 msgstr "Fairchild"
 
+#: my-evolution/Locations.h:698
 msgid "Fairfield"
 msgstr "Fairfield"
 
+#: my-evolution/Locations.h:699
 msgid "Fairmont"
 msgstr "Fairmont"
 
-msgid "Falkland Islands"
-msgstr "Falkland Adaları"
-
+#: my-evolution/Locations.h:700
 msgid "Fallon"
 msgstr "Fallon"
 
+#: my-evolution/Locations.h:701
 msgid "Falls City"
 msgstr "Falls City"
 
+#: my-evolution/Locations.h:702
 msgid "Falmouth-Otis AFB"
 msgstr "Falmouth-Otis AFB"
 
-msgid "Family Name"
-msgstr "Tam İsim"
-
+#: my-evolution/Locations.h:703
 msgid "Farbanks/Eielson AFB"
 msgstr "Farbanks/Eielson AFB"
 
+#: my-evolution/Locations.h:704
 msgid "Fargo"
 msgstr "Fargo"
 
+#: my-evolution/Locations.h:705
 msgid "Farmingdale"
 msgstr "Farmingdale"
 
+#: my-evolution/Locations.h:706
 msgid "Farmington"
 msgstr "Farmington"
 
+#: my-evolution/Locations.h:707
 msgid "Farmville"
 msgstr "Farmville"
 
+#: my-evolution/Locations.h:708
 msgid "Faro"
 msgstr "Faro"
 
-msgid "Faroe Islands"
-msgstr "Faroe Adaları"
-
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "%ld yakınında e-posta ayrıştırma hatası (dizin: %s)"
-
+#: my-evolution/Locations.h:709
 msgid "Fayetteville"
 msgstr "Fayetteville"
 
-msgid "February"
-msgstr "Şubat"
-
+#: my-evolution/Locations.h:710
 msgid "Feng Nin"
 msgstr "Feng Nin"
 
+#: my-evolution/Locations.h:711
 msgid "Fergus Falls"
 msgstr "Fergus Falls"
 
+#: my-evolution/Locations.h:712
 msgid "Fernando De Noronha"
 msgstr "Fernando De Noronha"
 
+#: my-evolution/Locations.h:713
 msgid "Ferrara"
 msgstr "Ferrara"
 
-msgid "Fetching Mail"
-msgstr "İleti Alınıyor"
-
-msgid "Fetching summary information for new messages"
-msgstr "Yeni iletilerdeki özet bilgiler alınıyor"
-
-msgid "Few clouds"
-msgstr "Az bulutlu"
-
-msgid "Few ice crystals"
-msgstr "Az derecede buzlanma"
-
+#: my-evolution/Locations.h:714
 msgid "Figari"
 msgstr "Figari"
 
-msgid "Fiji"
-msgstr "Fiji"
-
-msgid "File %s does not exist"
-msgstr "%s dosyası bulunamadı."
-
-msgid "File A_s:"
-msgstr "Farklı _Dosya:"
-
-msgid "File As"
-msgstr "Farklı Dosyala"
-
-msgid "File exists, overwrite?"
-msgstr "Dosya var. Üzerine yazılsın mı?"
-
-msgid "File name:"
-msgstr "Dosya adı:"
-
-msgid "File type:"
-msgstr "Dosya türü:"
-
-msgid "Filename:"
-msgstr "Dosya adı:"
-
-msgid "Filter Rules"
-msgstr "Filtre Kuralları"
-
-msgid "Filter on Mailing List"
-msgstr "E-posta Listesine Göre Filtrele"
-
-msgid "Filter on Mailing List (%s)"
-msgstr "E-posta Listesine Göre Filtrele (%s)"
-
-msgid "Filter on Mailing _List..."
-msgstr "_E-posta Listelerine Göre Filtrele..."
-
-msgid "Filter on Re_cipients"
-msgstr "_Alıcılara Göre Filtrele"
-
-msgid "Filter on Se_nder..."
-msgstr "_Gönderene Göre Filtrele..."
-
-msgid "Filter on Sen_der"
-msgstr "_Gönderene Göre Filtrele"
-
-msgid "Filter on Sub_ject"
-msgstr "_Konuya Göre Filtrele"
-
-msgid "Filter on _Mailing List"
-msgstr "_E-posta Listelerine Göre Filtrele"
-
-msgid "Filter on _Recipients..."
-msgstr "_Alıcılara Göre Filtrele..."
-
-msgid "Filter on _Subject..."
-msgstr "_Konuya Göre Filtrele..."
-
-msgid "Filtering Folder"
-msgstr "Dizin filtreleniyor"
-
-msgid "Filters"
-msgstr "Filtreler"
-
-msgid "Find Now"
-msgstr "Şimdi Bul"
-
-msgid "Find in Message"
-msgstr "İletide Bul"
-
-msgid "Find:"
-msgstr "Bul:"
-
+#: my-evolution/Locations.h:715
 msgid "Findlay"
 msgstr "Findlay"
 
-msgid "Finland"
-msgstr "Finlandiya"
-
+#: my-evolution/Locations.h:717
 msgid "Firenze"
 msgstr "Firenze"
 
+#: my-evolution/Locations.h:718
 msgid "Fitchburg"
 msgstr "Fitchburg"
 
-msgid "Flagged"
-msgstr "İşaretli"
-
+#: my-evolution/Locations.h:719
 msgid "Flagstaff"
 msgstr "Flagstaff"
 
+#: my-evolution/Locations.h:720
 msgid "Flint"
 msgstr "Flint"
 
+#: my-evolution/Locations.h:721
 msgid "Flippin"
 msgstr "Flippin"
 
+#: my-evolution/Locations.h:722
 msgid "Florence"
 msgstr "Florence"
 
+#: my-evolution/Locations.h:723
 msgid "Florennes"
 msgstr "Florennes"
 
+#: my-evolution/Locations.h:724
 msgid "Flores"
 msgstr "Flores"
 
+#: my-evolution/Locations.h:725
 msgid "Florianopolis"
 msgstr "Florianopolis"
 
+#: my-evolution/Locations.h:726
 msgid "Florida"
 msgstr "Florida"
 
+#: my-evolution/Locations.h:727
 msgid "Floro"
 msgstr "Floro"
 
-msgid "Folder"
-msgstr "Dizin"
-
-msgid "Folder `%s' does not exist."
-msgstr "%s dizini bulunamadı."
-
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "`%s' dizini boş değil. Silinmedi."
-
-msgid "Folder containing appointments and events"
-msgstr "Randevuları tutan dizin"
-
-msgid "Folder containing contact information"
-msgstr "Bağlantı bilgisini içeren dizin"
-
-msgid "Folder containing mail"
-msgstr "İletileri içeren dizin"
-
-msgid "Folder containing the Evolution Summary"
-msgstr "Evolution Özeti içeren dizin"
-
-msgid "Folder containing to-do items"
-msgstr "Yapılacaklar listesini tutan dizin"
-
-msgid "Folder name cannot contain slashes."
-msgstr "Dizin içinde bölü karakteri bulunamaz."
-
-msgid "Folder name cannot contain the Return character."
-msgstr "Dizin içinde yeni satır karakteri bulunamaz."
-
-msgid "Folder name:"
-msgstr "Dizin adı:"
-
-msgid "Folder type:"
-msgstr "Dizin türü:"
-
-msgid "Folder was destroyed and recreated on server."
-msgstr "Sunucudaki dizin silindi ve yeniden oluşturuldu."
-
-msgid "Folders"
-msgstr "Dizinler"
-
+#: my-evolution/Locations.h:728
 msgid "Fond Du Lac"
 msgstr "Fond Du Lac"
 
-msgid "Fonts"
-msgstr "Yazıtipleri"
-
-msgid "Footer:"
-msgstr "Altbilgi:"
-
-msgid "For connecting to and downloading mail from POP servers."
-msgstr "POP sunucularından ileti alma ve göndermede kullanmak için"
-
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "SMTP üzerinden bir sunucuya bağlanıp iletilerinizi göndermek için.\n"
-
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr "Yerel sistemdeki sendmail programının iletilerinizi göndermesi için."
-
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr ""
-"Standart UNIX posta kutularından ileti alma ve göndermede kullanmak için"
-
-msgid "For reading and storing mail on IMAP servers."
-msgstr "IMAP sunucuları ileti alma ve göndermede kullanmak için"
-
-msgid "For reading mail as a query of another set of folders"
-msgstr "diğer bir dizin listesinden alınan iletileri okumak için"
-
-msgid "For storing local mail in MH-like mail directories."
-msgstr "MH benzeri e-posta dizinleri içinde yerel postalar tutmak için."
-
-msgid "For_mat"
-msgstr "Biçi_m"
-
-msgid "Force images in HTML mail to be loaded"
-msgstr "HTML iletideki resimleri yükle"
-
+#: my-evolution/Locations.h:729
 msgid "Forde/Bringeland"
 msgstr "Forde/Bringeland"
 
-msgid "Forget _Passwords"
-msgstr "Parolaları _Unut"
-
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Bilinen parolaları unut (tüm parolaları yeniden girmeniz gerekecektir)"
-
+#: my-evolution/Locations.h:730
 msgid "Forli"
 msgstr "Forli"
 
-msgid "Format"
-msgstr "Biçim"
-
+#: my-evolution/Locations.h:731
 msgid "Formosa"
 msgstr "Formosa"
 
+#: my-evolution/Locations.h:732
+msgid "Fortaleza"
+msgstr "Fortaleza"
+
+#: my-evolution/Locations.h:733
 msgid "Fort Belvoir"
 msgstr "Fort Belvoir"
 
+#: my-evolution/Locations.h:734
 msgid "Fort Benning"
 msgstr "Fort Benning"
 
+#: my-evolution/Locations.h:735
 msgid "Fort Bragg"
 msgstr "Fort Bragg"
 
+#: my-evolution/Locations.h:736
 msgid "Fort Campbell"
 msgstr "Fort Campbell"
 
+#: my-evolution/Locations.h:737
 msgid "Fort Carson"
 msgstr "Fort Carson"
 
+#: my-evolution/Locations.h:738
 msgid "Fort Collins"
 msgstr "Fort Collins"
 
+#: my-evolution/Locations.h:739
 msgid "Fort Collins/Lovel"
 msgstr "Fort Collins/Lovel"
 
+#: my-evolution/Locations.h:740
 msgid "Fort Dodge"
 msgstr "Fort Dodge"
 
+#: my-evolution/Locations.h:741
 msgid "Fort Drum"
 msgstr "Fort Drum"
 
+#: my-evolution/Locations.h:742
 msgid "Fort Eustis"
 msgstr "Fort Eustis"
 
+#: my-evolution/Locations.h:743
 msgid "Fort Greely/Allen AAF"
 msgstr "Fort Greely/Allen AAF"
 
+#: my-evolution/Locations.h:744
 msgid "Fort Huachuca"
 msgstr "Fort Huachuca"
 
+#: my-evolution/Locations.h:745
 msgid "Fort Knox"
 msgstr "Fort Knox"
 
+#: my-evolution/Locations.h:746
 msgid "Fort Lauderdale"
 msgstr "Fort Lauderdale"
 
+#: my-evolution/Locations.h:747
 msgid "Fort Lauderdale (International)"
 msgstr "Fort Lauderdale (International)"
 
+#: my-evolution/Locations.h:748
 msgid "Fort Leonard"
 msgstr "Fort Leonard"
 
+#: my-evolution/Locations.h:749
 msgid "Fort Lewis"
 msgstr "Fort Lewis"
 
+#: my-evolution/Locations.h:750
 msgid "Fort Madison"
 msgstr "Fort Madison"
 
+#: my-evolution/Locations.h:751
 msgid "Fort Meade"
 msgstr "Fort Meade"
 
+#: my-evolution/Locations.h:752
 msgid "Fort Myers (Page Field)"
 msgstr "Fort Myers (Page Field)"
 
+#: my-evolution/Locations.h:753
 msgid "Fort Myers (Southwest Florida International)"
 msgstr "Fort Myers (Southwest Florida International)"
 
+#: my-evolution/Locations.h:754
 msgid "Fort Polk-Leesville"
 msgstr "Fort Polk-Leesville"
 
+#: my-evolution/Locations.h:755
 msgid "Fort Riley"
 msgstr "Fort Riley"
 
+#: my-evolution/Locations.h:756
 msgid "Fort Sill"
 msgstr "Fort Sill"
 
+#: my-evolution/Locations.h:757
 msgid "Fort Smith"
 msgstr "Fort Smith"
 
+#: my-evolution/Locations.h:758
 msgid "Fort Stewart"
 msgstr "Fort Stewart"
 
+#: my-evolution/Locations.h:759
 msgid "Fort Stockton"
 msgstr "Fort Stockton"
 
+#: my-evolution/Locations.h:760
 msgid "Fort Wayne"
 msgstr "Fort Wayne"
 
-msgid "Fort Worth NAS"
-msgstr "Fort Worth NAS"
-
+#: my-evolution/Locations.h:761
 msgid "Fort Worth-Alliance"
 msgstr "Fort Worth-Alliance"
 
+#: my-evolution/Locations.h:762
 msgid "Fort Worth-Meacham"
 msgstr "Fort Worth-Meacham"
 
-msgid "Fortaleza"
-msgstr "Fortaleza"
-
-msgid "Forward"
-msgstr "Yönlendir"
-
-msgid "Forward As"
-msgstr "Farklı Yönlendir"
-
-msgid "Forward Contact"
-msgstr "Bağlantıyı Gönder"
-
-msgid "Forward _Attached"
-msgstr "_Ekli Yönlendir"
-
-msgid "Forward _Inline"
-msgstr "İçinde _Yönlendir"
-
-msgid "Forward as i_Calendar"
-msgstr "i_Calendar Olarak Yönlendir"
-
-msgid "Forward the selected message to someone"
-msgstr "Seçilen iletiyi birisine yönlendir"
-
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Seçilen iletiyi birisine eklenti olarak yönlendir"
-
-msgid "Forward this item via email"
-msgstr "Bu öğeyi ileti ile yönlendir"
-
-msgid "Forwarded Message"
-msgstr "Yönlendirilmiş İleti"
-
-msgid "Forwarded message"
-msgstr "Yönlendirilmiş ileti"
-
-msgid "Forwarded message - %s"
-msgstr "Yönlendirilmiş ileti - %s"
-
-msgid "Forwarded messages"
-msgstr "Yönlendirilmiş iletiler"
+#: my-evolution/Locations.h:763
+msgid "Fort Worth NAS"
+msgstr "Fort Worth NAS"
 
+#: my-evolution/Locations.h:764
 msgid "Fourchon"
 msgstr "Fourchon"
 
+#: my-evolution/Locations.h:765
 msgid "Foz Do Iguacu"
 msgstr "Foz Do Iguacu"
 
-msgid "Fr"
-msgstr "Cu"
-
-msgid "France"
-msgstr "Fransa"
-
+#: my-evolution/Locations.h:767
 msgid "Frankfort"
 msgstr "Frankfort"
 
+#: my-evolution/Locations.h:768
 msgid "Frankfurt/Main"
 msgstr "Frankfurt/Main"
 
+#: my-evolution/Locations.h:769
 msgid "Franklin"
 msgstr "Franklin"
 
+#: my-evolution/Locations.h:770
 msgid "Fredericton"
 msgstr "Fredericton"
 
-msgid "Free"
-msgstr "Boş"
-
-msgid "Free-busy URL"
-msgstr "Web Sayfası"
-
-msgid "Free/Busy Information"
-msgstr "Boş/Meşgul Bilgisi"
-
-msgid "Free/Busy Reply"
-msgstr "Boş/Meşgul Cevabı"
-
-msgid "Free/Busy Request"
-msgstr "Boş/Meşgul İsteği"
-
-msgid "Free/Busy info begins: <b>"
-msgstr "Boş/Meşgul bilgi başlangıcı: <b>"
-
-msgid "Free/Busy info ends: <b>"
-msgstr "Boş/Meşgul bilgi bitişi: <b>"
-
-msgid "Free/Busy information"
-msgstr "Boş/Meşgul bilgisi"
-
+#: my-evolution/Locations.h:771
 msgid "Freeport"
 msgstr "Freeport"
 
-msgid "Freezing rain"
-msgstr "Dondurucu yağmur"
-
-msgid "Freezing sandstorm"
-msgstr "Dondurucu toz fırtınası"
-
-msgid "Freezing snow"
-msgstr "Dondurucu kar"
-
-msgid "French Guiana"
-msgstr "Fransız Guyanası"
-
-msgid "French Polynesia"
-msgstr "Fransız Polinezyası"
-
-msgid "French Southern Territories"
-msgstr "French Southern Territories"
-
+#: my-evolution/Locations.h:772
 msgid "Frenchville"
 msgstr "Frenchville"
 
+#: my-evolution/Locations.h:773
 msgid "Fresno"
 msgstr "Fresno"
 
+#: my-evolution/Locations.h:774
 msgid "Fresno-Chandler"
 msgstr "Fresno-Chandler"
 
-msgid "Friday"
-msgstr "Cuma"
-
+#: my-evolution/Locations.h:775
 msgid "Friday Harbor"
 msgstr "Friday Harbor"
 
+#: my-evolution/Locations.h:776
 msgid "Friedrichshafen"
 msgstr "Friedrichshafen"
 
+#: my-evolution/Locations.h:777
 msgid "Frigg"
 msgstr "Frigg"
 
-msgid "From"
-msgstr "Gönderen"
-
-msgid "From:"
-msgstr "Gönderen:"
-
+#: my-evolution/Locations.h:778
 msgid "Frontone"
 msgstr "Frontone"
 
+#: my-evolution/Locations.h:779
 msgid "Frosinone"
 msgstr "Frosinone"
 
+#: my-evolution/Locations.h:780
 msgid "Fryeburg"
 msgstr "Fryeburg"
 
+#: my-evolution/Locations.h:781
 msgid "Fujairah"
 msgstr "Fujairah"
 
+#: my-evolution/Locations.h:782
 msgid "Fuji Ab"
 msgstr "Fuji Ab"
 
+#: my-evolution/Locations.h:783
 msgid "Fukue Airport"
 msgstr "Fukue Airport"
 
+#: my-evolution/Locations.h:784
 msgid "Fukui Airport"
 msgstr "Fukui Airport"
 
+#: my-evolution/Locations.h:785
 msgid "Fukuoka Airport"
 msgstr "Fukuoka Airport"
 
-msgid "Full Name"
-msgstr "Tam İsim"
-
-msgid "Full _Name..."
-msgstr "_Tam İsim..."
-
+#: my-evolution/Locations.h:786
 msgid "Fullerton"
 msgstr "Fullerton"
 
+#: my-evolution/Locations.h:787
 msgid "Funchal"
 msgstr "Funchal"
 
-msgid "Function not implemented in this storage"
-msgstr "Fonksiyon desteklenmiyor"
-
-msgid "Gabon"
-msgstr "Gabon"
+#: my-evolution/Locations.h:788
+msgid "FYR Macedonia"
+msgstr "FYR Macedonia"
 
+#: my-evolution/Locations.h:789
 msgid "Gadsden"
 msgstr "Gadsden"
 
+#: my-evolution/Locations.h:790
 msgid "Gage"
 msgstr "Gage"
 
+#: my-evolution/Locations.h:791
 msgid "Gainesville"
 msgstr "Gainesville"
 
+#: my-evolution/Locations.h:792
 msgid "Galax-Hillsville"
 msgstr "Galax-Hillsville"
 
+#: my-evolution/Locations.h:793
 msgid "Galbraith Lake"
 msgstr "Galbraith Lake"
 
+#: my-evolution/Locations.h:794
 msgid "Galeao"
 msgstr "Galeao"
 
+#: my-evolution/Locations.h:795
 msgid "Galena"
 msgstr "Galena"
 
+#: my-evolution/Locations.h:796
 msgid "Galesburg"
 msgstr "Galesburg"
 
+#: my-evolution/Locations.h:797
 msgid "Gallup"
 msgstr "Gallup"
 
+#: my-evolution/Locations.h:798
 msgid "Galveston"
 msgstr "Galveston"
 
+#: my-evolution/Locations.h:799
 msgid "Gambell"
 msgstr "Gambell"
 
-msgid "Gambia"
-msgstr "Gambia"
-
+#: my-evolution/Locations.h:800
 msgid "Gander"
 msgstr "Gander"
 
+#: my-evolution/Locations.h:801
 msgid "Garden City"
 msgstr "Garden City"
 
+#: my-evolution/Locations.h:802
 msgid "Gary"
 msgstr "Gary"
 
+#: my-evolution/Locations.h:803
 msgid "Gassim"
 msgstr "Gassim"
 
+#: my-evolution/Locations.h:804
 msgid "Gatineau"
 msgstr "Gatineau"
 
+#: my-evolution/Locations.h:805
 msgid "Gaziantep"
 msgstr "Gaziantep"
 
+#: my-evolution/Locations.h:806
 msgid "Gdansk"
 msgstr "Gdansk"
 
-msgid "General"
-msgstr "Genel"
-
-msgid "Generating message list"
-msgstr "İleti listesi oluşturuluyor"
-
-msgid "Generic error"
-msgstr "Genel hata"
-
+#: my-evolution/Locations.h:807
 msgid "Geneve"
 msgstr "Geneve"
 
+#: my-evolution/Locations.h:808
 msgid "Genova"
 msgstr "Genova"
 
-msgid "Geographical Position"
-msgstr "Coğrafi Konum"
-
+#: my-evolution/Locations.h:809
 msgid "George Airport"
 msgstr "George Airport"
 
+#: my-evolution/Locations.h:810
 msgid "Georgetown"
 msgstr "Georgetown"
 
-msgid "Georgia"
-msgstr "Gürcistan"
-
-msgid "Germany"
-msgstr "Almanya"
-
-msgid "Get Digital ID..."
-msgstr "Sayısal Numarayı Al..."
-
-msgid "Getting Folder Information"
-msgstr "Dizin Bilgisi Alınıyor"
-
-msgid "Getting message %d (%d%%)"
-msgstr "%d (%%%d) iletisi alınıyor"
-
-msgid "Getting message %d of %d"
-msgstr "%d/%d ileti alınıyor"
-
-msgid "Ghana"
-msgstr "Gana"
-
+#: my-evolution/Locations.h:813
 msgid "Ghardaia"
 msgstr "Ghardaia"
 
+#: my-evolution/Locations.h:814
 msgid "Ghedi"
 msgstr "Ghedi"
 
-msgid "Gibraltar"
-msgstr "Cebelitarık"
-
+#: my-evolution/Locations.h:816
 msgid "Gifu Ab"
 msgstr "Gifu Ab"
 
+#: my-evolution/Locations.h:817
 msgid "Gila Bend"
 msgstr "Gila Bend"
 
+#: my-evolution/Locations.h:818
 msgid "Gillette"
 msgstr "Gillette"
 
+#: my-evolution/Locations.h:819
 msgid "Gilze-Rijen"
 msgstr "Gilze-Rijen"
 
+#: my-evolution/Locations.h:820
 msgid "Gioia del Colle"
 msgstr "Gioia del Colle"
 
+#: my-evolution/Locations.h:821
 msgid "Girona"
 msgstr "Girona"
 
+#: my-evolution/Locations.h:822
 msgid "Gizan"
 msgstr "Gizan"
 
+#: my-evolution/Locations.h:823
 msgid "Glasgow"
 msgstr "Glasgow"
 
+#: my-evolution/Locations.h:824
 msgid "Glendive"
 msgstr "Glendive"
 
+#: my-evolution/Locations.h:825
 msgid "Glens Falls"
 msgstr "Glens Falls"
 
-msgid "Go To"
-msgstr "Git"
-
-msgid "Go To Date"
-msgstr "Tarihe Git"
-
-msgid "Go To Today"
-msgstr "Bugüne Git"
-
-msgid "Go back"
-msgstr "Geri git"
-
-msgid "Go forward"
-msgstr "İleri git"
-
-msgid "Go to _Date"
-msgstr "_Tarihe Git"
-
-msgid "Go to _Today"
-msgstr "_Bugüne Git"
-
-msgid "Go to a specific date"
-msgstr "Belirli bir tarihe git"
-
-msgid "Go to folder..."
-msgstr "Dizine git..."
-
-msgid "Go to today"
-msgstr "Bugüne git"
-
+#: my-evolution/Locations.h:826
 msgid "Goiania"
 msgstr "Goiania"
 
+#: my-evolution/Locations.h:827
 msgid "Goldsboro"
 msgstr "Goldsboro"
 
+#: my-evolution/Locations.h:828
 msgid "Goodland"
 msgstr "Goodland"
 
+#: my-evolution/Locations.h:829
 msgid "Goose Bay"
 msgstr "Goose Bay"
 
+#: my-evolution/Locations.h:830
 msgid "Goteborg (Landvetter)"
 msgstr "Goteborg (Landvetter)"
 
+#: my-evolution/Locations.h:831
 msgid "Goteborg (Save)"
 msgstr "Goteborg (Save)"
 
+#: my-evolution/Locations.h:832
 msgid "Granada"
 msgstr "Granada"
 
+#: my-evolution/Locations.h:833
 msgid "Grand Canyon"
 msgstr "Grand Canyon"
 
+#: my-evolution/Locations.h:834
 msgid "Grand Cayman"
 msgstr "Grand Cayman"
 
+#: my-evolution/Locations.h:835
 msgid "Grand Forks"
 msgstr "Grand Forks"
 
+#: my-evolution/Locations.h:836
 msgid "Grand Island"
 msgstr "Grand Island"
 
+#: my-evolution/Locations.h:837
 msgid "Grand Isle"
 msgstr "Grand Isle"
 
+#: my-evolution/Locations.h:838
 msgid "Grand Junction"
 msgstr "Grand Junction"
 
+#: my-evolution/Locations.h:839
 msgid "Grand Marais"
 msgstr "Grand Marais"
 
+#: my-evolution/Locations.h:840
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
 
+#: my-evolution/Locations.h:841
 msgid "Grandview"
 msgstr "Grandview"
 
+#: my-evolution/Locations.h:842
 msgid "Grangeville"
 msgstr "Grangeville"
 
+#: my-evolution/Locations.h:843
 msgid "Grants"
 msgstr "Grants"
 
+#: my-evolution/Locations.h:844
 msgid "Graz"
 msgstr "Graz"
 
+#: my-evolution/Locations.h:845
 msgid "Great Falls"
 msgstr "Great Falls"
 
-msgid "Greece"
-msgstr "Yunanistan"
-
-msgid "Greek"
-msgstr "Yunanca"
-
+#: my-evolution/Locations.h:847
 msgid "Greeley"
 msgstr "Greeley"
 
+#: my-evolution/Locations.h:848
 msgid "Green Bay"
 msgstr "Green Bay"
 
+#: my-evolution/Locations.h:849
 msgid "Green River"
 msgstr "Green River"
 
-msgid "Greenland"
-msgstr "Grönland"
-
+#: my-evolution/Locations.h:850
 msgid "Greensboro"
 msgstr "Greensboro"
 
+#: my-evolution/Locations.h:851
 msgid "Greenville"
 msgstr "Greenville"
 
+#: my-evolution/Locations.h:852
 msgid "Greenville-Spartanburg"
 msgstr "Greenville-Spartanburg"
 
+#: my-evolution/Locations.h:853
 msgid "Greenwood"
 msgstr "Greenwood"
 
-msgid "Grenada"
-msgstr "Granada"
-
+#: my-evolution/Locations.h:854
 msgid "Grenoble-Saint-Geoirs"
 msgstr "Grenoble-Saint-Geoirs"
 
+#: my-evolution/Locations.h:855
 msgid "Griffiss AFB"
 msgstr "Griffiss AFB"
 
+#: my-evolution/Locations.h:856
 msgid "Groningen"
 msgstr "Groningen"
 
+#: my-evolution/Locations.h:857
 msgid "Grosseto"
 msgstr "Grosseto"
 
+#: my-evolution/Locations.h:858
 msgid "Groton"
 msgstr "Groton"
 
-msgid "Group"
-msgstr "Grup"
-
-msgid "Group name:"
-msgstr "Grup adı:"
-
+#: my-evolution/Locations.h:859
 msgid "Guadalajara"
 msgstr "Guadalajara"
 
+#: my-evolution/Locations.h:860
 msgid "Guadalupe Pass"
 msgstr "Guadalupe Pass"
 
-msgid "Guadeloupe"
-msgstr "Guadeloupe"
-
-msgid "Guam"
-msgstr "Guam"
-
+#: my-evolution/Locations.h:861
 msgid "Guanare"
 msgstr "Guanare"
 
+#: my-evolution/Locations.h:862
 msgid "Guangzhou"
 msgstr "Guangzhou"
 
+#: my-evolution/Locations.h:863
 msgid "Guantanamo"
 msgstr "Guantanamo"
 
+#: my-evolution/Locations.h:864
 msgid "Guarany"
 msgstr "Guarany"
 
+#: my-evolution/Locations.h:865
 msgid "Guaratingueta"
 msgstr "Guaratingueta"
 
+#: my-evolution/Locations.h:866
 msgid "Guarulhos"
 msgstr "Guarulhos"
 
-msgid "Guatemala"
-msgstr "Guatemala"
-
+#: my-evolution/Locations.h:868
 msgid "Guayaquil/Simon Bolivar"
 msgstr "Guayaquil/Simon Bolivar"
 
+#: my-evolution/Locations.h:869
 msgid "Guaymas"
 msgstr "Guaymas"
 
+#: my-evolution/Locations.h:870
 msgid "Guernsey"
 msgstr "Guernsey"
 
+#: my-evolution/Locations.h:871
 msgid "Guidonia"
 msgstr "Guidonia"
 
-msgid "Guinea"
-msgstr "Gine"
-
-msgid "Guinea-bissau"
-msgstr "Guinea-bissau"
-
+#: my-evolution/Locations.h:872
 msgid "Gulfport"
 msgstr "Gulfport"
 
+#: my-evolution/Locations.h:873
 msgid "Gulkana"
 msgstr "Gulkana"
 
+#: my-evolution/Locations.h:874
 msgid "Gullfax C"
 msgstr "Gullfax C"
 
+#: my-evolution/Locations.h:875
 msgid "Gunnison"
 msgstr "Gunnison"
 
+#: my-evolution/Locations.h:876
 msgid "Gunnison (2)"
 msgstr "Gunnison (2)"
 
+#: my-evolution/Locations.h:877
 msgid "Guriat"
 msgstr "Guriat"
 
+#: my-evolution/Locations.h:878
 msgid "Gustavus"
 msgstr "Gustavus"
 
-msgid "Guyana"
-msgstr "Guyana"
-
+#: my-evolution/Locations.h:879
 msgid "Guymon"
 msgstr "Guymon"
 
-msgid "HTML signature file:"
-msgstr "HTML imza dosyası:"
-
-msgid "H_TML"
-msgstr "H_TML"
-
-msgid "Ha Noi"
-msgstr "Ha Noi"
-
+#: my-evolution/Locations.h:880
 msgid "Habana"
 msgstr "Habana"
 
+#: my-evolution/Locations.h:881
 msgid "Hachijojima Airport"
 msgstr "Hachijojima Airport"
 
+#: my-evolution/Locations.h:882
 msgid "Hachinohe Ab"
 msgstr "Hachinohe Ab"
 
+#: my-evolution/Locations.h:883
 msgid "Hafr Al-Batin"
 msgstr "Hafr Al-Batin"
 
+#: my-evolution/Locations.h:884
 msgid "Hagerstown"
 msgstr "Hagerstown"
 
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
 msgid "Hail"
 msgstr "Hail"
 
+#: my-evolution/Locations.h:886
 msgid "Hailey-Sun Valley"
 msgstr "Hailey-Sun Valley"
 
+#: my-evolution/Locations.h:887
 msgid "Haines"
 msgstr "Haines"
 
-msgid "Haiti"
-msgstr "Haiti"
-
+#: my-evolution/Locations.h:889
 msgid "Hakodate Airport"
 msgstr "Hakodate Airport"
 
+#: my-evolution/Locations.h:890
 msgid "Halifax"
 msgstr "Halifax"
 
+#: my-evolution/Locations.h:891
 msgid "Hamamatsu Ab"
 msgstr "Hamamatsu Ab"
 
+#: my-evolution/Locations.h:892
 msgid "Hamburg"
 msgstr "Hamburg"
 
+#: my-evolution/Locations.h:893
 msgid "Hamburg-Finkenwerder"
 msgstr "Hamburg-Finkenwerder"
 
+#: my-evolution/Locations.h:894
 msgid "Hamilton"
 msgstr "Hamilton"
 
+#: my-evolution/Locations.h:895
 msgid "Hammerfest"
 msgstr "Hammerfest"
 
+#: my-evolution/Locations.h:896
 msgid "Hampton"
 msgstr "Hampton"
 
+#: my-evolution/Locations.h:897
 msgid "Hanamaki Airport"
 msgstr "Hanamaki Airport"
 
+#: my-evolution/Locations.h:898
 msgid "Hancock"
 msgstr "Hancock"
 
+#: my-evolution/Locations.h:899
 msgid "Hangzhou"
 msgstr "Hangzhou"
 
+#: my-evolution/Locations.h:900
 msgid "Hanksville"
 msgstr "Hanksville"
 
+#: my-evolution/Locations.h:901
 msgid "Hannover"
 msgstr "Hannover"
 
+#: my-evolution/Locations.h:902
+msgid "Ha Noi"
+msgstr "Ha Noi"
+
+#: my-evolution/Locations.h:903
 msgid "Harbor Beach"
 msgstr "Harbor Beach"
 
+#: my-evolution/Locations.h:904
 msgid "Harlingen"
 msgstr "Harlingen"
 
+#: my-evolution/Locations.h:905
 msgid "Harlowton"
 msgstr "Harlowton"
 
+#: my-evolution/Locations.h:906
 msgid "Harrisburg"
 msgstr "Harrisburg"
 
+#: my-evolution/Locations.h:907
 msgid "Harrison"
 msgstr "Harrison"
 
+#: my-evolution/Locations.h:908
 msgid "Harstad/Narvik/Evenes"
 msgstr "Harstad/Narvik/Evenes"
 
+#: my-evolution/Locations.h:909
 msgid "Hartford"
 msgstr "Hartford"
 
-msgid "Has subfolders"
-msgstr "Alt dizinler"
-
+#: my-evolution/Locations.h:910
 msgid "Hassi-Messaoud"
 msgstr "Hassi-Messaoud"
 
+#: my-evolution/Locations.h:911
 msgid "Hastings"
 msgstr "Hastings"
 
+#: my-evolution/Locations.h:912
 msgid "Haugesund"
 msgstr "Haugesund"
 
+#: my-evolution/Locations.h:913
 msgid "Havre"
 msgstr "Havre"
 
+#: my-evolution/Locations.h:914
 msgid "Hawaii"
 msgstr "Hawaii"
 
+#: my-evolution/Locations.h:915
 msgid "Hawthorne"
 msgstr "Hawthorne"
 
+#: my-evolution/Locations.h:916
 msgid "Hayden"
 msgstr "Hayden"
 
+#: my-evolution/Locations.h:917
 msgid "Hayes River"
 msgstr "Hayes River"
 
+#: my-evolution/Locations.h:918
 msgid "Hays"
 msgstr "Hays"
 
+#: my-evolution/Locations.h:919
 msgid "Hayward"
 msgstr "Hayward"
 
-msgid "Header"
-msgstr "Üstbilgi"
-
-msgid "Header/Footer"
-msgstr "Üstbilgi/Altbilgi"
-
-msgid "Headings"
-msgstr "Başlıklar"
-
-msgid "Headings for each letter"
-msgstr "Her mektup için başlıklar"
-
+#: my-evolution/Locations.h:920
 msgid "Healy River"
 msgstr "Healy River"
 
-msgid "Heard And McDonald Islands"
-msgstr "Heard And McDonald Adaları"
-
-msgid "Heavy rain"
-msgstr "Ağır yağmur"
-
-msgid "Heavy snow"
-msgstr "Ağır kar yağışı"
-
-msgid "Height:"
-msgstr "Yükseklik:"
-
+#: my-evolution/Locations.h:921
 msgid "Helena"
 msgstr "Helena"
 
-msgid "Help message"
-msgstr "Yardım mesajı"
-
+#: my-evolution/Locations.h:922
 msgid "Helsinki"
 msgstr "Helsinki"
 
+#: my-evolution/Locations.h:923
 msgid "Henderson"
 msgstr "Henderson"
 
+#: my-evolution/Locations.h:924
 msgid "Hengchun"
 msgstr "Hengchun"
 
+#: my-evolution/Locations.h:925
 msgid "Hermosillo"
 msgstr "Hermosillo"
 
+#: my-evolution/Locations.h:926
 msgid "Hibbing"
 msgstr "Hibbing"
 
+#: my-evolution/Locations.h:927
 msgid "Hickory"
 msgstr "Hickory"
 
-msgid "Hide"
-msgstr "Gizle"
-
-msgid "Hide S_elected Messages"
-msgstr "Seçili İletileri Gizle"
-
-msgid "Hide _Deleted Messages"
-msgstr "_Silenen İletileri Gizle"
-
-msgid "Hide _Read Messages"
-msgstr "_Okunan İletileri Gizle"
-
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Silinen iletileri üzerine çizgi çekmek yerine gizle"
-
-msgid "Hide the shortcut bar"
-msgstr "Kısayol çubuğunu gizle"
-
-msgid "High"
-msgstr "Yüksek"
-
-msgid "Higher"
-msgstr "Yüksek"
-
-msgid "Highest"
-msgstr "En Yüksek"
-
+#: my-evolution/Locations.h:928
 msgid "Hill City"
 msgstr "Hill City"
 
+#: my-evolution/Locations.h:929
 msgid "Hillsboro"
 msgstr "Hillsboro"
 
+#: my-evolution/Locations.h:930
 msgid "Hilo"
 msgstr "Hilo"
 
+#: my-evolution/Locations.h:931
 msgid "Hinesville"
 msgstr "Hinesville"
 
+#: my-evolution/Locations.h:932
 msgid "Hiroshima Airport"
 msgstr "Hiroshima Airport"
 
-msgid "Ho Chi Minh"
-msgstr "Ho Chi Minh"
-
+#: my-evolution/Locations.h:933
 msgid "Hobart"
 msgstr "Hobart"
 
+#: my-evolution/Locations.h:934
 msgid "Hobbs"
 msgstr "Hobbs"
 
+#: my-evolution/Locations.h:935
+msgid "Ho Chi Minh"
+msgstr "Ho Chi Minh"
+
+#: my-evolution/Locations.h:936
 msgid "Hodeidah"
 msgstr "Hodeidah"
 
+#: my-evolution/Locations.h:937
 msgid "Hof"
 msgstr "Hof"
 
+#: my-evolution/Locations.h:938
 msgid "Hoffman"
 msgstr "Hoffman"
 
+#: my-evolution/Locations.h:939
 msgid "Hofu Ab"
 msgstr "Hofu Ab"
 
+#: my-evolution/Locations.h:940
 msgid "Hohenems"
 msgstr "Hohenems"
 
+#: my-evolution/Locations.h:941
 msgid "Holguin"
 msgstr "Holguin"
 
-msgid "Holy See"
-msgstr "Holy See"
-
-msgid "Home"
-msgstr "Ev"
-
-msgid "Home 2"
-msgstr "2. ev"
-
-msgid "Home Address"
-msgstr "Ev Adresi"
-
-msgid "Home Fax"
-msgstr "Ev Faksı"
-
-msgid "Home Phone"
-msgstr "Ev Telefonu"
-
-msgid "Home Phone 2"
-msgstr "2. Ev Telefonu"
-
+#: my-evolution/Locations.h:942
 msgid "Homer"
 msgstr "Homer"
 
+#: my-evolution/Locations.h:943
 msgid "Homestead AFB"
 msgstr "Homestead AFB"
 
+#: my-evolution/Locations.h:944
 msgid "Hondo"
 msgstr "Hondo"
 
-msgid "Honduras"
-msgstr "Honduras"
-
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
+#: my-evolution/Locations.h:947
 msgid "Honningsvag"
 msgstr "Honningsvag"
 
+#: my-evolution/Locations.h:948
 msgid "Honolulu"
 msgstr "Honolulu"
 
+#: my-evolution/Locations.h:949
 msgid "Hoonah"
 msgstr "Hoonah"
 
+#: my-evolution/Locations.h:950
 msgid "Hoquiam"
 msgstr "Hoquiam"
 
-msgid "Host"
-msgstr "Makina"
-
-msgid "Host lookup failed: %s: host not found"
-msgstr "Makine adı çözümlemesinde hata: %s: Makine bulunamadı"
-
-msgid "Host lookup failed: %s: unknown reason"
-msgstr "Makine adı çözümlemesinde hata: %s: bilinmeyen hata"
-
+#: my-evolution/Locations.h:951
 msgid "Hot Springs"
 msgstr "Hot Springs"
 
+#: my-evolution/Locations.h:952
 msgid "Houghton Lake"
 msgstr "Houghton Lake"
 
+#: my-evolution/Locations.h:953
 msgid "Houlton"
 msgstr "Houlton"
 
+#: my-evolution/Locations.h:954
 msgid "Houma"
 msgstr "Houma"
 
-msgid "Hours"
-msgstr "Saat"
-
+#: my-evolution/Locations.h:955
 msgid "Houston-Bush"
 msgstr "Houston-Bush"
 
+#: my-evolution/Locations.h:956
 msgid "Houston-Clover"
 msgstr "Houston-Clover"
 
+#: my-evolution/Locations.h:957
 msgid "Houston-Ellington Field"
 msgstr "Houston-Ellington Field"
 
+#: my-evolution/Locations.h:958
 msgid "Houston-Hobby"
 msgstr "Houston-Hobby"
 
+#: my-evolution/Locations.h:959
 msgid "Houston-Hooks"
 msgstr "Houston-Hooks"
 
-msgid "How many days should the calendar display at once?"
-msgstr "Takvim aynı anda ekranda kaç gün göstersin?"
-
+#: my-evolution/Locations.h:960
 msgid "Howard AFB"
 msgstr "Howard AFB"
 
+#: my-evolution/Locations.h:961
 msgid "Hsinchu"
 msgstr "Hsinchu"
 
+#: my-evolution/Locations.h:962
 msgid "Huanuco"
 msgstr "Huanuco"
 
+#: my-evolution/Locations.h:963
 msgid "Huehuetenango"
 msgstr "Huehuetenango"
 
+#: my-evolution/Locations.h:964
 msgid "Hulien"
 msgstr "Hulien"
 
+#: my-evolution/Locations.h:965
 msgid "Humberside"
 msgstr "Humberside"
 
-msgid "Hungary"
-msgstr "Macaristan"
-
+#: my-evolution/Locations.h:967
 msgid "Huntington"
 msgstr "Huntington"
 
+#: my-evolution/Locations.h:968
 msgid "Huntsville"
 msgstr "Huntsville"
 
+#: my-evolution/Locations.h:969
 msgid "Hurlburt"
 msgstr "Hurlburt"
 
+#: my-evolution/Locations.h:970
 msgid "Huron"
 msgstr "Huron"
 
+#: my-evolution/Locations.h:971
 msgid "Hutchinson"
 msgstr "Hutchinson"
 
+#: my-evolution/Locations.h:972
 msgid "Hyakuri Ab"
 msgstr "Hyakuri Ab"
 
+#: my-evolution/Locations.h:973
 msgid "Hyannis"
 msgstr "Hyannis"
 
+#: my-evolution/Locations.h:974
 msgid "Hyderabad"
 msgstr "Hyderabad"
 
+#: my-evolution/Locations.h:975
 msgid "Hyeres-Le Palyvestre"
 msgstr "Hyeres-Le Palyvestre"
 
-msgid "I"
-msgstr "I"
-
-msgid "I/O error"
-msgstr "G/Ç hatası"
-
-msgid "II"
-msgstr "II"
-
-msgid "III"
-msgstr "III"
-
-msgid "IMAP"
-msgstr "IMAP"
-
-msgid "IMAP command failed: %s"
-msgstr "IMAP komutu başarısız oldu: %s"
-
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "%s IMAP sunucusu %s kimlik sınama yöntemini desteklemiyor"
-
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
-
-msgid "IMAPv4 "
-msgstr "IMAPv4 "
-
-msgid "ISDN"
-msgstr "ISDN"
-
+#: my-evolution/Locations.h:976
 msgid "Iasi"
 msgstr "Iasi"
 
+#: my-evolution/Locations.h:977
 msgid "Ibiza"
 msgstr "Ibiza"
 
-msgid "Ice crystal storm"
-msgstr "Buz fırtınası"
-
-msgid "Ice crystals"
-msgstr "Buzlanma"
-
-msgid "Ice crystals in the vicinity"
-msgstr "Yer yer buzlanma"
-
-msgid "Ice pellets"
-msgstr "Buz peltesi"
-
-msgid "Iceland"
-msgstr "İzlanda"
-
+#: my-evolution/Locations.h:979
 msgid "Ichikawa"
 msgstr "Ichikawa"
 
+#: my-evolution/Locations.h:980
 msgid "Idaho"
 msgstr "Idaho"
 
+#: my-evolution/Locations.h:981
 msgid "Idaho Falls"
 msgstr "Idaho Falls"
 
-msgid "Identity"
-msgstr "Kimlik"
-
-msgid "If"
-msgstr "Eğer"
-
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Eğer bu dizini tekrar açamazsınız, elle \n"
-"düzeltme yapmak zorunda kalacaksınız."
-
+#: my-evolution/Locations.h:982
 msgid "Iguazu"
 msgstr "Iguazu"
 
+#: my-evolution/Locations.h:983
 msgid "Iki Airport"
 msgstr "Iki Airport"
 
+#: my-evolution/Locations.h:984
 msgid "Ilan"
 msgstr "Ilan"
 
+#: my-evolution/Locations.h:985
 msgid "Iliamna"
 msgstr "Iliamna"
 
+#: my-evolution/Locations.h:986
 msgid "Illinois"
 msgstr "Illinois"
 
-msgid "Immediately follow each other"
-msgstr "Birbirini ardışık takip et"
-
+#: my-evolution/Locations.h:987
 msgid "Imperial"
 msgstr "Imperial"
 
+#: my-evolution/Locations.h:988
 msgid "Imperial (2)"
 msgstr "Imperial (2)"
 
+#: my-evolution/Locations.h:989
 msgid "Imperial Beach"
 msgstr "Imperial Beach"
 
-msgid "Import"
-msgstr "Aktar"
-
-msgid "Import File (step 3 of 3)"
-msgstr "Dosya Aktar (adım 3/3)"
-
-msgid "Import a single file"
-msgstr "Tek dosya aktar"
-
-msgid "Import data from other programs"
-msgstr "Diğer programlardan veri al"
-
-msgid "Important"
-msgstr "Önemli"
-
-msgid "Importer Type (step 1 of 3)"
-msgstr "Aktarıcı Türü (adım 1/3)"
-
-msgid "Importers"
-msgstr "Alıcılar"
-
-msgid "Importing"
-msgstr "Alınıyor"
-
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"%s alınıyor\n"
-"(Hazır değil).\n"
-"5 saniye içinde yeniden denenecek."
-
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"%s alınıyor\n"
-"%d öğesi alınıyor."
-
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"%s alınıyor\n"
-"1. öğe alınıyor."
-
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"%s alınıyor.\n"
-"%s başlatılıyor"
-
-msgid "Importing Files"
-msgstr "Dosyalar Alınıyor"
-
-msgid "Importing..."
-msgstr "Alınıyor..."
-
-msgid "Imports LDIF files into Evolution."
-msgstr "LDIF dosyalarını Evolution'a aktarır."
-
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Outlook Express dosyalarını Evolution'a aktarır"
-
-msgid "Imports VCard files into Evolution."
-msgstr "VCard dosyalarını Evolution'a aktarır."
-
-msgid "Imports mbox files into Evolution"
-msgstr "Mbox dosyalarını Evolution'a aktarır"
-
+#: my-evolution/Locations.h:990
 msgid "In Amenas"
 msgstr "In Amenas"
 
-msgid "In HTML mail"
-msgstr "HTML İleti İçinde"
-
-msgid "In Process"
-msgstr "İşlemde"
-
-msgid "In Progress"
-msgstr "İşlemde"
-
-msgid "Inbox"
-msgstr "Gelen"
-
-msgid "Include:"
-msgstr "İçer:"
-
-msgid "Incoming"
-msgstr "Gelen"
-
-msgid "Increase the text size"
-msgstr "Metin boyunu büyüt"
-
-msgid "Indexing:"
-msgstr "İndeksleniyor:"
-
-msgid "India"
-msgstr "Hindistan"
-
-msgid "Indian Springs"
-msgstr "Indian Springs"
-
-msgid "Indian/Antananarivo"
-msgstr "Hindistan/Antananarivo"
-
-msgid "Indian/Christmas"
-msgstr "Hindistan/Christmas"
-
-msgid "Indian/Cocos"
-msgstr "Hindistan/Cocos"
-
-msgid "Indian/Comoro"
-msgstr "Indian/Comoro"
-
-msgid "Indian/Kerguelen"
-msgstr "Indian/Kerguelen"
-
-msgid "Indian/Mahe"
-msgstr "Indian/Mahe"
-
-msgid "Indian/Maldives"
-msgstr "Indian/Maldives"
-
-msgid "Indian/Mauritius"
-msgstr "Indian/Mauritius"
-
-msgid "Indian/Mayotte"
-msgstr "Indian/Mayotte"
-
-msgid "Indian/Reunion"
-msgstr "Indian/Reunion"
-
+#: my-evolution/Locations.h:992
 msgid "Indiana"
 msgstr "Indiana"
 
+#: my-evolution/Locations.h:993
 msgid "Indianapolis"
 msgstr "Indianapolis"
 
-msgid "Individual"
-msgstr "Bireysel"
-
-msgid "Indonesia"
-msgstr "İndonezya"
-
-msgid "Information"
-msgstr "Bilgi"
-
-msgid "Inline"
-msgstr "Bağlantılı"
+#: my-evolution/Locations.h:994
+msgid "Indian Springs"
+msgstr "Indian Springs"
 
+#: my-evolution/Locations.h:995
 msgid "Innsbruck"
 msgstr "Innsbruck"
 
-msgid "Input File"
-msgstr "Girdi Dosyası"
-
-msgid "Insert File"
-msgstr "Dosya İçer"
-
-msgid "Insert a file as text into the message"
-msgstr "İletiye bir metin dosyası ekle"
-
-msgid "Insert text file..."
-msgstr "Metin dosyası yerleştir..."
-
-msgid "Internal error"
-msgstr "İç hata"
-
+#: my-evolution/Locations.h:996
 msgid "International Falls"
 msgstr "International Falls"
 
-msgid "Interrupted"
-msgstr "Kesintiye uğradı"
-
+#: my-evolution/Locations.h:997
 msgid "Intracoastal"
 msgstr "Intracoastal"
 
-msgid "Invalid"
-msgstr "Geçersiz"
-
-msgid "Invalid URI"
-msgstr "Geçersiz URI"
-
-msgid "Invalid argument"
-msgstr "Geçersiz argüman"
-
-msgid "Invalid arguments"
-msgstr "Geçersiz argümanlar"
-
-msgid ""
-"Invalid email address trace information:\n"
-"%s"
-msgstr ""
-"Geçersiz e-posta adres izleme bilgisi:\n"
-"%s"
-
-msgid "Invalid message contents"
-msgstr "Geçersiz ileti içeriği"
-
-msgid ""
-"Invalid opaque trace information:\n"
-"%s"
-msgstr ""
-"Hatalı opak izleme bilgisi:\n"
-"%s"
-
-msgid ""
-"Invalid trace information:\n"
-"%s"
-msgstr ""
-"Hatalı izleme bilgisi:\n"
-"%s"
-
+#: my-evolution/Locations.h:998
 msgid "Inverness"
 msgstr "Inverness"
 
+#: my-evolution/Locations.h:999
 msgid "Inyokern"
 msgstr "Inyokern"
 
+#: my-evolution/Locations.h:1000
 msgid "Iowa"
 msgstr "Iowa"
 
+#: my-evolution/Locations.h:1001
 msgid "Iowa City"
 msgstr "Iowa City"
 
+#: my-evolution/Locations.h:1002
 msgid "Iqaluit"
 msgstr "Iqaluit"
 
+#: my-evolution/Locations.h:1003
 msgid "Iquique/Diego Arac"
 msgstr "Iquique/Diego Arac"
 
+#: my-evolution/Locations.h:1004
 msgid "Iquitos"
 msgstr "Iquitos"
 
+#: my-evolution/Locations.h:1005
 msgid "Iraklion"
 msgstr "Iraklion"
 
+#: my-evolution/Locations.h:1006
 msgid "Iran, Islamic Republic of"
 msgstr "Iran, Islamic Republic of"
 
-msgid "Ireland"
-msgstr "İrlanda"
-
+#: my-evolution/Locations.h:1008
 msgid "Iron Mountain"
 msgstr "Iron Mountain"
 
+#: my-evolution/Locations.h:1009
 msgid "Ironwood"
 msgstr "Ironwood"
 
+#: my-evolution/Locations.h:1010
 msgid "Iruma Ab"
 msgstr "Iruma Ab"
 
+#: my-evolution/Locations.h:1011
 msgid "Islamabad"
 msgstr "Islamabad"
 
+#: my-evolution/Locations.h:1012
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
+#: my-evolution/Locations.h:1013
 msgid "Islip"
 msgstr "Islip"
 
-msgid "Israel"
-msgstr "İsrail"
-
+#: my-evolution/Locations.h:1014
 msgid "Istanbul"
 msgstr "İstanbul"
 
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"E-posta sunucusu tüm alıcıları Apparently-to başlığı ekleyerek görünür hale "
-"getirebilir.\n"
-"Yine de göndereyim mi?"
-
+#: my-evolution/Locations.h:1015
 msgid "Itaituba"
 msgstr "Itaituba"
 
-msgid "Italy"
-msgstr "İtalya"
-
-msgid "Item sent!\n"
-msgstr "Öğe gönderildi!\n"
-
+#: my-evolution/Locations.h:1017
 msgid "Ithaca"
 msgstr "Ithaca"
 
+#: my-evolution/Locations.h:1018
+msgid "Ivano-Frankivsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1019
 msgid "Iwakuni MCAS"
 msgstr "Iwakuni MCAS"
 
+#: my-evolution/Locations.h:1020
 msgid "Iwojima"
 msgstr "Iwojima"
 
+#: my-evolution/Locations.h:1021
 msgid "Ixtapa"
 msgstr "Ixtapa"
 
+#: my-evolution/Locations.h:1022
 msgid "Izmir/Adnan Menderes"
 msgstr "İzmir/Adnan Menderes"
 
+#: my-evolution/Locations.h:1023
 msgid "Izmir/Cigli"
 msgstr "İzmir/Çiğli"
 
+#: my-evolution/Locations.h:1024
 msgid "Izmit"
 msgstr "İzmit"
 
+#: my-evolution/Locations.h:1025
 msgid "Izumo Airport"
 msgstr "Izumo Airport"
 
+#: my-evolution/Locations.h:1026
 msgid "Jackson"
 msgstr "Jackson"
 
+#: my-evolution/Locations.h:1027
 msgid "Jacksonville"
 msgstr "Jacksonville"
 
-msgid "Jacksonville NAS"
-msgstr "Jacksonville NAS"
-
+#: my-evolution/Locations.h:1028
 msgid "Jacksonville-Craig Airport"
 msgstr "Jacksonville-Craig Airport"
 
+#: my-evolution/Locations.h:1029
+msgid "Jacksonville NAS"
+msgstr "Jacksonville NAS"
+
+#: my-evolution/Locations.h:1030
 msgid "Jaffrey"
 msgstr "Jaffrey"
 
-msgid "Jamaica"
-msgstr "Jamaika"
-
+#: my-evolution/Locations.h:1032
 msgid "Jamestown"
 msgstr "Jamestown"
 
-msgid "Jan Smuts"
-msgstr "Jan Smuts"
-
+#: my-evolution/Locations.h:1033
 msgid "Janesville"
 msgstr "Janesville"
 
-msgid "January"
-msgstr "Ocak"
-
-msgid "Japan"
-msgstr "Japonya"
-
-msgid "Japanese"
-msgstr "Japonca"
+#: my-evolution/Locations.h:1034
+msgid "Jan Smuts"
+msgstr "Jan Smuts"
 
+#: my-evolution/Locations.h:1036
 msgid "Jeddah King Abdul Aziz International Airport"
 msgstr "Jeddah King Abdul Aziz International Airport"
 
+#: my-evolution/Locations.h:1037
 msgid "Jefferson City"
 msgstr "Jefferson City"
 
+#: my-evolution/Locations.h:1038
 msgid "Jerez"
 msgstr "Jerez"
 
+#: my-evolution/Locations.h:1039
 msgid "Jersey"
 msgstr "Jersey"
 
+#: my-evolution/Locations.h:1040
 msgid "Jinotega"
 msgstr "Jinotega"
 
+#: my-evolution/Locations.h:1041
 msgid "Johan A. Pengel"
 msgstr "Johan A. Pengel"
 
+#: my-evolution/Locations.h:1042
 msgid "Johnstown"
 msgstr "Johnstown"
 
+#: my-evolution/Locations.h:1043
 msgid "Jonesboro"
 msgstr "Jonesboro"
 
+#: my-evolution/Locations.h:1044
 msgid "Jonkoping"
 msgstr "Jonkoping"
 
+#: my-evolution/Locations.h:1045
 msgid "Joplin"
 msgstr "Joplin"
 
-msgid "Jordan"
-msgstr "Ürdün"
-
-msgid "Jr."
-msgstr "Jr."
+#: my-evolution/Locations.h:1047
+msgid "Juanjui"
+msgstr "Juanjui"
 
+#: my-evolution/Locations.h:1048
 msgid "Juan Santamaria"
 msgstr "Juan Santamaria"
 
-msgid "Juanjui"
-msgstr "Juanjui"
-
+#: my-evolution/Locations.h:1049
 msgid "Juigalpa"
 msgstr "Juigalpa"
 
+#: my-evolution/Locations.h:1050
 msgid "Jujuy"
 msgstr "Jujuy"
 
+#: my-evolution/Locations.h:1051
 msgid "Juliaca"
 msgstr "Juliaca"
 
-msgid "July"
-msgstr "Temmuz"
-
+#: my-evolution/Locations.h:1052
 msgid "Junction"
 msgstr "Junction"
 
-msgid "June"
-msgstr "Haziran"
-
+#: my-evolution/Locations.h:1053
 msgid "Juneau"
 msgstr "Juneau"
 
+#: my-evolution/Locations.h:1054
 msgid "Kadena Ab"
 msgstr "Kadena Ab"
 
+#: my-evolution/Locations.h:1055
 msgid "Kagoshima Airport"
 msgstr "Kagoshima Airport"
 
+#: my-evolution/Locations.h:1056
 msgid "Kahului"
 msgstr "Kahului"
 
+#: my-evolution/Locations.h:1057
 msgid "Kailua-Kona"
 msgstr "Kailua-Kona"
 
+#: my-evolution/Locations.h:1058
 msgid "Kake"
 msgstr "Kake"
 
+#: my-evolution/Locations.h:1059
 msgid "Kalamata"
 msgstr "Kalamata"
 
+#: my-evolution/Locations.h:1060
 msgid "Kalamazoo"
 msgstr "Kalamazoo"
 
+#: my-evolution/Locations.h:1061
 msgid "Kalispell"
 msgstr "Kalispell"
 
+#: my-evolution/Locations.h:1062
 msgid "Kamigoto"
 msgstr "Kamigoto"
 
+#: my-evolution/Locations.h:1063
 msgid "Kaneohe"
 msgstr "Kaneohe"
 
+#: my-evolution/Locations.h:1064
 msgid "Kangshan"
 msgstr "Kangshan"
 
+#: my-evolution/Locations.h:1065
 msgid "Kanoya Ab"
 msgstr "Kanoya Ab"
 
+#: my-evolution/Locations.h:1066
 msgid "Kansai International Airport"
 msgstr "Kansai International Airport"
 
+#: my-evolution/Locations.h:1067
 msgid "Kansas"
 msgstr "Kansas"
 
+#: my-evolution/Locations.h:1068
 msgid "Kansas City"
 msgstr "Kansas City"
 
+#: my-evolution/Locations.h:1069
 msgid "Kansas City-Gladstone"
 msgstr "Kansas City-Gladstone"
 
+#: my-evolution/Locations.h:1070
 msgid "Kaohsiung"
 msgstr "Kaohsiung"
 
+#: my-evolution/Locations.h:1071
 msgid "Karachi"
 msgstr "Karachi"
 
+#: my-evolution/Locations.h:1072
 msgid "Karup"
 msgstr "Karup"
 
+#: my-evolution/Locations.h:1073
 msgid "Kassel-Calden"
 msgstr "Kassel-Calden"
 
+#: my-evolution/Locations.h:1074
 msgid "Kasumigaura Ab"
 msgstr "Kasumigaura Ab"
 
+#: my-evolution/Locations.h:1075
 msgid "Kasuminome Ab"
 msgstr "Kasuminome Ab"
 
+#: my-evolution/Locations.h:1076
 msgid "Katowice"
 msgstr "Katowice"
 
+#: my-evolution/Locations.h:1077
 msgid "Kavala"
 msgstr "Kavala"
 
+#: my-evolution/Locations.h:1078
 msgid "Kayseri"
 msgstr "Kayseri"
 
-msgid "Kazakhstan"
-msgstr "Kazakistan"
-
+#: my-evolution/Locations.h:1079
 msgid "Kazan"
 msgstr "Kazan"
 
+#: my-evolution/Locations.h:1080
 msgid "Kearney"
 msgstr "Kearney"
 
+#: my-evolution/Locations.h:1081
 msgid "Keene"
 msgstr "Keene"
 
+#: my-evolution/Locations.h:1082
 msgid "Kefallinia"
 msgstr "Kefallinia"
 
+#: my-evolution/Locations.h:1083
 msgid "Keflavik"
 msgstr "Keflavik"
 
+#: my-evolution/Locations.h:1084
 msgid "Kenai"
 msgstr "Kenai"
 
+#: my-evolution/Locations.h:1085
 msgid "Kenosha"
 msgstr "Kenosha"
 
+#: my-evolution/Locations.h:1086
 msgid "Kentucky"
 msgstr "Kentucky"
 
-msgid "Kenya"
-msgstr "Kenya"
-
+#: my-evolution/Locations.h:1087
 msgid "Keokuk"
 msgstr "Keokuk"
 
-msgid "Kerberos "
-msgstr "Kerberos "
-
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
+#: my-evolution/Locations.h:1088
 msgid "Kerkira"
 msgstr "Kerkira"
 
+#: my-evolution/Locations.h:1089
 msgid "Kerman"
 msgstr "Kerman"
 
+#: my-evolution/Locations.h:1090
 msgid "Ketchikan"
 msgstr "Ketchikan"
 
+#: my-evolution/Locations.h:1091
 msgid "Key West"
 msgstr "Key West"
 
+#: my-evolution/Locations.h:1092
 msgid "Key West NAS"
 msgstr "Key West NAS"
 
+#: my-evolution/Locations.h:1093
 msgid "Khabarovsk"
 msgstr "Khabarovsk"
 
+#: my-evolution/Locations.h:1094
 msgid "Khamis Mushait"
 msgstr "Khamis Mushait"
 
+#: my-evolution/Locations.h:1095
+msgid "Kharkiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1096
 msgid "Kikai Island"
 msgstr "Kikai Island"
 
+#: my-evolution/Locations.h:1097
 msgid "Killeen"
 msgstr "Killeen"
 
+#: my-evolution/Locations.h:1098
 msgid "Killeen-Ft Hood"
 msgstr "Killeen-Ft Hood"
 
+#: my-evolution/Locations.h:1099
 msgid "Killeen-Gray AAF"
 msgstr "Killeen-Gray AAF"
 
+#: my-evolution/Locations.h:1100
 msgid "King Khaled International Airport"
 msgstr "King Khaled International Airport"
 
-msgid "King Salmon"
-msgstr "King Salmon"
-
+#: my-evolution/Locations.h:1101
 msgid "Kingman"
 msgstr "Kingman"
 
+#: my-evolution/Locations.h:1102
+msgid "King Salmon"
+msgstr "King Salmon"
+
+#: my-evolution/Locations.h:1103
 msgid "Kingston"
 msgstr "Kingston"
 
+#: my-evolution/Locations.h:1104
 msgid "Kingsville"
 msgstr "Kingsville"
 
+#: my-evolution/Locations.h:1105
 msgid "Kinloss"
 msgstr "Kinloss"
 
+#: my-evolution/Locations.h:1106
 msgid "Kinston"
 msgstr "Kinston"
 
-msgid "Kiribati"
-msgstr "Kiribati"
-
+#: my-evolution/Locations.h:1107
 msgid "Kirkenes"
 msgstr "Kirkenes"
 
+#: my-evolution/Locations.h:1108
 msgid "Kirksville"
 msgstr "Kirksville"
 
+#: my-evolution/Locations.h:1109
 msgid "Kiruna"
 msgstr "Kiruna"
 
+#: my-evolution/Locations.h:1110
 msgid "Kisarazu Ab"
 msgstr "Kisarazu Ab"
 
+#: my-evolution/Locations.h:1111
 msgid "Kishineu"
 msgstr "Kishineu"
 
+#: my-evolution/Locations.h:1112
 msgid "Kitakyushu Airport"
 msgstr "Kitakyushu Airport"
 
+#: my-evolution/Locations.h:1113
 msgid "Klagenfurt"
 msgstr "Klagenfurt"
 
+#: my-evolution/Locations.h:1114
 msgid "Klamath Falls"
 msgstr "Klamath Falls"
 
+#: my-evolution/Locations.h:1115
 msgid "Klawock"
 msgstr "Klawock"
 
+#: my-evolution/Locations.h:1116
 msgid "Kleine Brogel"
 msgstr "Kleine Brogel"
 
+#: my-evolution/Locations.h:1117
 msgid "Kliningrad"
 msgstr "Kliningrad"
 
+#: my-evolution/Locations.h:1118
 msgid "Knoxville"
 msgstr "Knoxville"
 
+#: my-evolution/Locations.h:1119
 msgid "Knoxville-Downtown"
 msgstr "Knoxville-Downtown"
 
+#: my-evolution/Locations.h:1120
 msgid "Kobenhavn/Kastrup"
 msgstr "Kobenhavn/Kastrup"
 
+#: my-evolution/Locations.h:1121
 msgid "Kobenhavn/Roskilde"
 msgstr "Kobenhavn/Roskilde"
 
+#: my-evolution/Locations.h:1122
 msgid "Kochi Airport"
 msgstr "Kochi Airport"
 
+#: my-evolution/Locations.h:1123
 msgid "Kodiak"
 msgstr "Kodiak"
 
+#: my-evolution/Locations.h:1124
 msgid "Kogalniceanu"
 msgstr "Kogalniceanu"
 
+#: my-evolution/Locations.h:1125
 msgid "Kogalym"
 msgstr "Kogalym"
 
+#: my-evolution/Locations.h:1126
 msgid "Koksijde"
 msgstr "Koksijde"
 
+#: my-evolution/Locations.h:1127
 msgid "Kolding/Vandrup"
 msgstr "Kolding/Vandrup"
 
+#: my-evolution/Locations.h:1128
 msgid "Koln/Bonn"
 msgstr "Koln/Bonn"
 
+#: my-evolution/Locations.h:1129
 msgid "Komatsu Ab"
 msgstr "Komatsu Ab"
 
+#: my-evolution/Locations.h:1130
 msgid "Komatsujima Ab"
 msgstr "Komatsujima Ab"
 
+#: my-evolution/Locations.h:1131
 msgid "Konya"
 msgstr "Konya"
 
+#: my-evolution/Locations.h:1132
 msgid "Korea, Democratic People's Republic of"
 msgstr "Korea, Democratic People's Republic of"
 
+#: my-evolution/Locations.h:1133
 msgid "Korea, Republic of"
 msgstr "Korea, Republic of"
 
-msgid "Korean"
-msgstr "Korece"
-
+#: my-evolution/Locations.h:1134
 msgid "Kos"
 msgstr "Kos"
 
+#: my-evolution/Locations.h:1135
 msgid "Kotzebue"
 msgstr "Kotzebue"
 
+#: my-evolution/Locations.h:1136
 msgid "Kozani"
 msgstr "Kozani"
 
+#: my-evolution/Locations.h:1137
 msgid "Krakow"
 msgstr "Krakow"
 
+#: my-evolution/Locations.h:1138
 msgid "Krasnodar"
 msgstr "Krasnodar"
 
+#: my-evolution/Locations.h:1139
 msgid "Krasnoyarsk"
 msgstr "Krasnoyarsk"
 
+#: my-evolution/Locations.h:1140
 msgid "Kristiansand/Kjevik"
 msgstr "Kristiansand/Kjevik"
 
+#: my-evolution/Locations.h:1141
 msgid "Kristiansund/Kvernberget"
 msgstr "Kristiansund/Kvernberget"
 
+#: my-evolution/Locations.h:1142
+msgid "Kryviy Rig/Lozovatka"
+msgstr ""
+
+#: my-evolution/Locations.h:1143
 msgid "Kumamoto Airport"
 msgstr "Kumamoto Airport"
 
+#: my-evolution/Locations.h:1144
 msgid "Kunming"
 msgstr "Kunming"
 
+#: my-evolution/Locations.h:1145
 msgid "Kushiro Airport"
 msgstr "Kushiro Airport"
 
-msgid "Kuwait"
-msgstr "Kuveyt"
-
-msgid "Kyrgyzstan"
-msgstr "Kırgızistan"
-
-msgid "LDAP Server"
-msgstr "LDAP Sunucusu"
-
-msgid "LDAP server containing contact information"
-msgstr "Bağlantı bilgisini içeren LDAP sunucusu"
+#: my-evolution/Locations.h:1147
+msgid "Kyiv/Boryspil"
+msgstr ""
 
-msgid "L_ocation:"
-msgstr "_Konum: "
+#: my-evolution/Locations.h:1148
+msgid "Kyiv/Zhulyany"
+msgstr ""
 
+#: my-evolution/Locations.h:1149
 msgid "La Ceiba"
 msgstr "La Ceiba"
 
+#: my-evolution/Locations.h:1150
+msgid "Laconia"
+msgstr "Laconia"
+
+#: my-evolution/Locations.h:1151
 msgid "La Coruna"
 msgstr "La Coruna"
 
+#: my-evolution/Locations.h:1152
 msgid "La Crosse"
 msgstr "La Crosse"
 
+#: my-evolution/Locations.h:1153
 msgid "La Esperanza"
 msgstr "La Esperanza"
 
-msgid "La Grande"
-msgstr "La Grande"
-
-msgid "La Junta"
-msgstr "La Junta"
-
-msgid "La Mesa"
-msgstr "La Mesa"
-
-msgid "La Paz"
-msgstr "La Paz"
-
-msgid "La Paz/Alto"
-msgstr "La Paz/Alto"
-
-msgid "La Romana"
-msgstr "La Romana"
-
-msgid "La Verne"
-msgstr "La Verne"
-
-msgid "Laconia"
-msgstr "Laconia"
-
+#: my-evolution/Locations.h:1154
 msgid "Lafayette"
 msgstr "Lafayette"
 
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr "La Grande"
+
+#: my-evolution/Locations.h:1156
 msgid "Lahaina"
 msgstr "Lahaina"
 
+#: my-evolution/Locations.h:1157
 msgid "Lahore"
 msgstr "Lahore"
 
+#: my-evolution/Locations.h:1158
 msgid "Lajes"
 msgstr "Lajes"
 
+#: my-evolution/Locations.h:1159
+msgid "La Junta"
+msgstr "La Junta"
+
+#: my-evolution/Locations.h:1160
 msgid "Lake Charles"
 msgstr "Lake Charles"
 
+#: my-evolution/Locations.h:1161
 msgid "Lake Hood"
 msgstr "Lake Hood"
 
-msgid "Lake Tahoe"
-msgstr "Lake Tahoe"
-
+#: my-evolution/Locations.h:1162
 msgid "Lakehurst"
 msgstr "Lakehurst"
 
+#: my-evolution/Locations.h:1163
 msgid "Lakeland"
 msgstr "Lakeland"
 
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr "Lake Tahoe"
+
+#: my-evolution/Locations.h:1165
 msgid "Lakeview"
 msgstr "Lakeview"
 
+#: my-evolution/Locations.h:1166
 msgid "Lamar"
 msgstr "Lamar"
 
+#: my-evolution/Locations.h:1167
+msgid "La Mesa"
+msgstr "La Mesa"
+
+#: my-evolution/Locations.h:1168
 msgid "Lamezia"
 msgstr "Lamezia"
 
+#: my-evolution/Locations.h:1169
 msgid "Lamoni"
 msgstr "Lamoni"
 
+#: my-evolution/Locations.h:1170
 msgid "Lampedusa"
 msgstr "Lampedusa"
 
+#: my-evolution/Locations.h:1171
 msgid "Lanai"
 msgstr "Lanai"
 
+#: my-evolution/Locations.h:1172
 msgid "Lancaster"
 msgstr "Lancaster"
 
+#: my-evolution/Locations.h:1173
 msgid "Lander"
 msgstr "Lander"
 
-msgid "Landscape"
-msgstr "Yatay"
-
+#: my-evolution/Locations.h:1174
 msgid "Langebaanweg"
 msgstr "Langebaanweg"
 
+#: my-evolution/Locations.h:1175
 msgid "Langley AFB"
 msgstr "Langley AFB"
 
-msgid "Language"
-msgstr "Dil"
-
+#: my-evolution/Locations.h:1176
 msgid "Lannion"
 msgstr "Lannion"
 
+#: my-evolution/Locations.h:1177
 msgid "Lansing"
 msgstr "Lansing"
 
+#: my-evolution/Locations.h:1178
 msgid "Lanzhou"
 msgstr "Lanzhou"
 
-msgid "Laos"
-msgstr "Laos"
+#: my-evolution/Locations.h:1179
+msgid "La Paz"
+msgstr "La Paz"
+
+#: my-evolution/Locations.h:1180
+msgid "La Paz/Alto"
+msgstr "La Paz/Alto"
 
+#: my-evolution/Locations.h:1181
 msgid "Laramie"
 msgstr "Laramie"
 
+#: my-evolution/Locations.h:1182
 msgid "Laredo"
 msgstr "Laredo"
 
+#: my-evolution/Locations.h:1183
 msgid "Larnaka"
 msgstr "Larnaka"
 
+#: my-evolution/Locations.h:1184
+msgid "La Romana"
+msgstr "La Romana"
+
+#: my-evolution/Locations.h:1185
 msgid "Las Americas"
 msgstr "Las Americas"
 
+#: my-evolution/Locations.h:1186
 msgid "Las Tunas"
 msgstr "Las Tunas"
 
+#: my-evolution/Locations.h:1187
 msgid "Las Vegas"
 msgstr "Las Vegas"
 
+#: my-evolution/Locations.h:1188
 msgid "Latina"
 msgstr "Latina"
 
+#: my-evolution/Locations.h:1189
 msgid "Latrobe"
 msgstr "Latrobe"
 
-msgid "Latvia"
-msgstr "Latvia"
-
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
+#: my-evolution/Locations.h:1192
+msgid "La Verne"
+msgstr "La Verne"
+
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-msgid "Le Havre-Octeville"
-msgstr "Le Havre-Octeville"
-
-msgid "Le Mans"
-msgstr "Le Mans"
-
-msgid "Le Marine"
-msgstr "Le Marine"
-
-msgid "Le Touquet"
-msgstr "Le Touquet"
-
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-msgid "Leave messages on server"
-msgstr "İletileri sunucuda bırak"
-
-msgid "Lebanon"
-msgstr "Lübnan"
-
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-msgid "Left:"
-msgstr "Sol:"
+#: my-evolution/Locations.h:1202
+msgid "Le Havre-Octeville"
+msgstr "Le Havre-Octeville"
 
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
+#: my-evolution/Locations.h:1205
+msgid "Le Mans"
+msgstr "Le Mans"
+
+#: my-evolution/Locations.h:1206
+msgid "Le Marine"
+msgstr "Le Marine"
+
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-msgid "Lesotho"
-msgstr "Lesotho"
-
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-msgid "Letter tabs on side"
-msgstr "Kenarda harf sekmeleri"
+#: my-evolution/Locations.h:1210
+msgid "Le Touquet"
+msgstr "Le Touquet"
 
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-msgid "Liberia"
-msgstr "Liberya"
-
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libya"
 
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-msgid "Liechtenstein"
-msgstr "Lihtenştayn"
-
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-msgid "Light mist"
-msgstr "Hafif sisli"
-
-msgid "Light rain"
-msgstr "Hafif yağmurlu"
-
-msgid "Light snow"
-msgstr "Hafif kar yağışı"
-
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-msgid "List _name:"
-msgstr "_Liste adı:"
-
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-msgid "Lithuania"
-msgstr "Litvanya"
-
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-msgid "Load _Images"
-msgstr "Resimleri _Yükle"
-
-msgid "Loading Calendar"
-msgstr "Takvim Yükleniyor"
-
-msgid "Loading calendar..."
-msgstr "Takvim yükleniyor..."
-
-msgid "Loading message content"
-msgstr "İleti içeriği yükleniyor"
-
-msgid "Loading..."
-msgstr "Yükleniyor..."
-
-msgid "Local Folders"
-msgstr "Yerel Dizinler"
-
-msgid "Local delivery"
-msgstr "Yerel aktarım"
-
-msgid "Local mail file %s"
-msgstr "Yerel mektup dosyası %s"
-
-msgid "Local stores do not have an inbox"
-msgstr "Yerel disklerde gelen dizini bulunmasın"
-
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/City"
 
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-msgid "Low"
-msgstr "Düşük"
-
-msgid "Lower"
-msgstr "Düşük"
-
-msgid "Lowest"
-msgstr "En Düşük"
-
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-msgid "Luxembourg"
-msgstr "Lüksemburg"
-
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Lviv"
+msgstr "Latvia"
+
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "MAIL FROM zaman aşımı: %s: ileti gönderilmedi"
-
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "MAIL FROM zaman aşımı: %s: ileti gönderilmedi"
-
-msgid "MH-format mail directories"
-msgstr "MH biçimli e-posta dizinleri"
-
-msgid "MIME type:"
-msgstr "MIME türü:"
-
-msgid "MTWTFSS"
-msgstr "PSÇPCCP"
-
-msgid "Ma_x number of items shown:"
-msgstr "_Gösterilecek azami öğe sayısı:"
-
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-msgid "Macau"
-msgstr "Macau"
-
-msgid "Macedonia"
-msgstr "Makedonya"
-
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-msgid "Madagascar"
-msgstr "Madagaskar"
-
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-msgid "Mail"
-msgstr "İleti"
-
-msgid "Mail Alarm Options"
-msgstr "E-posta Alarmı Seçenekleri"
-
-msgid "Mail Configuration"
-msgstr "İleti Yapılandırması"
-
-msgid "Mail Settings"
-msgstr "E-posta Ayarları"
-
-msgid "Mail append cancelled"
-msgstr "İleti aktarımı iptal edildi"
-
-msgid "Mail configuration interface"
-msgstr "İleti yapılandırma arayüzü"
-
-msgid "Mail delivery via the sendmail program"
-msgstr "Sendmail üzerinden ileti gönderimi"
-
-msgid "Mail from %s"
-msgstr "%s'ten E-posta"
-
-msgid "Mail storage folder (internal)"
-msgstr "İleti depolama dizini (iç kullanım)"
-
-msgid "Mail summary"
-msgstr "İleti özeti"
-
-msgid "Mail to %s"
-msgstr "%s adresine postala"
-
-msgid "Mailbox Format"
-msgstr "Posta Kutusu Biçimi"
-
-msgid "Mailbox location"
-msgstr "Posta Kutusu konumu"
-
-msgid "Maildir-format mail directories"
-msgstr "Maildir biçimli ileti dizinleri"
-
-msgid "Mailing list"
-msgstr "E-posta listesi"
-
-msgid "Main toolbar"
-msgstr "Ana araç çubuğu"
-
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-msgid "Make this Occurrence _Movable"
-msgstr "Bu _Oluşumu Taşınabilir Yap"
-
-msgid "Make this my _default account"
-msgstr "_Bunu öntanımlı hesabım yap"
-
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-msgid "Malawi"
-msgstr "Malawi"
-
-msgid "Malaysia"
-msgstr "Malezya"
-
-msgid "Maldives"
-msgstr "Maldivler"
-
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-msgid "Malformed external-body part."
-msgstr "Bozuk harici gövde"
-
-msgid "Mali"
-msgstr "Mali"
-
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-msgid "Malta"
-msgstr "Malta"
-
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-msgid "Man"
-msgstr "Yön"
-
-msgid "Manage Subscriptions"
-msgstr "Üyelikleri Düzenle"
-
-msgid "Manager"
-msgstr "Yönetici"
-
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-msgid "Mar Del Plata"
-msgstr "Mar Del Plata"
-
-msgid "Mar_k as Read"
-msgstr "_Okunmuş Olarak İşaretle"
-
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-msgid "March"
-msgstr "Mart"
+#: my-evolution/Locations.h:1316
+msgid "Mar Del Plata"
+msgstr "Mar Del Plata"
 
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-msgid "Margins"
-msgstr "Marjin"
-
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-msgid "Mark All as R_ead"
-msgstr "_Tümünü Okunmuş Olarak İşaretle"
-
-msgid "Mark all visible messages as read"
-msgstr "Tüm görünen iletileri okunmuş olarak işaretle"
-
-msgid "Mark as I_mportant"
-msgstr "Ön_emli Olarak İşaretle"
-
-msgid "Mark as U_nread"
-msgstr "Oku_nmamış Olarak İşaretle"
-
-msgid "Mark as Unim_portant"
-msgstr "Ön_emsiz Olarak İşaretle"
-
-msgid "Mark as Unimp_ortant"
-msgstr "Ö_nemsiz Olarak İşaretle"
-
-msgid "Mark as _Important"
-msgstr "Ö_nemli Olarak İşaretle"
-
-msgid "Mark the selected messages as having been read"
-msgstr "Seçili iletileri okunmuş olarak işaretle"
-
-msgid "Mark the selected messages as important"
-msgstr "Seçili iletileri önemli olarak işaretle"
-
-msgid "Mark the selected messages as not having been read"
-msgstr "Seçili iletileri okunmamış olarak işaretle"
-
-msgid "Mark the selected messages as unimportant"
-msgstr "Seçili iletileri önemsiz olarak işaretle"
-
-msgid "Mark the selected messages for deletion"
-msgstr "Seçili iletileri silmek için işaretle"
-
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-msgid "Marshall Islands"
-msgstr "Marshall Adaları"
-
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-msgid "Martinique"
-msgstr "Martinik"
-
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-msgid "Matches:"
-msgstr "Eşleşenler:"
-
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-msgid "Mauritania"
-msgstr "Moritanya"
-
-msgid "Mauritius"
-msgstr "Maritus"
-
-msgid "May"
-msgstr "Mayıs"
-
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-msgid "Mayotte"
-msgstr "Mayotte"
-
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-msgid "Mc Gregor"
-msgstr " "
-
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
+#: my-evolution/Locations.h:1360
+msgid "Mc Gregor"
+msgstr " "
+
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-msgid "Meeting"
-msgstr "Toplantı"
-
-msgid "Meeting Cancellation"
-msgstr "Toplantı İptali"
-
-msgid "Meeting Information"
-msgstr "Toplantı Bilgisi"
-
-msgid "Meeting Proposal"
-msgstr "Toplantı Taslağı"
-
-msgid "Meeting Reply"
-msgstr "Toplantı Yanıtı"
-
-msgid "Meeting Update"
-msgstr "Toplantı Güncellemesi"
-
-msgid "Meeting Update Request"
-msgstr "Toplantı Güncelleme Bilgisi İsteği"
-
-msgid "Meeting _end time:"
-msgstr "Toplantı _bitiş saati:"
-
-msgid "Meeting _start time:"
-msgstr "Toplantı b_aşlama saati :"
-
-msgid "Meeting begins: <b>"
-msgstr "Toplantı başlangıcı: <b>"
-
-msgid "Meeting ends: <b>"
-msgstr "Toplantı bitişi: <b>"
-
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-msgid "Member"
-msgstr "Üye"
-
-msgid "Members"
-msgstr "Üyeler"
-
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-msgid "Merge E-Mail Address"
-msgstr "E-posta Adresini Birleştir"
-
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-msgid "Message"
-msgstr "İleti"
-
-msgid "Message %s not found."
-msgstr "%s numaralı ileti bulunamadı."
-
-msgid "Message Alarm Options"
-msgstr "İleti Alarm Seçenekleri"
-
-msgid "Message Body"
-msgstr "İleti Gövdesi"
-
-msgid "Message Header"
-msgstr "İleti Başlığı"
-
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "İletiler düzenlenemiyor: İleti kutusu bozulmuş olabilir."
-
-msgid "Message contains"
-msgstr "İleti içerir"
-
-msgid "Message storage"
-msgstr "İleti deposu"
-
-msgid "Message to Display"
-msgstr "Gösterilecek İleti"
-
-msgid "Message was received"
-msgstr "İleti alındı"
-
-msgid "Message was sent"
-msgstr "İleti gönderildi"
-
-msgid "Messages"
-msgstr "İletiler"
-
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-msgid "Mexico"
-msgstr "Meksika"
-
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-msgid "Micronesia"
-msgstr "Mikronezya"
-
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Middle East"
 
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-msgid "Mineral Wells"
-msgstr " "
-
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
+#: my-evolution/Locations.h:1409
+msgid "Mineral Wells"
+msgstr " "
+
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-msgid "Minutes"
-msgstr "Dakika"
-
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-msgid "Miss"
-msgstr "Miss"
-
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-msgid "Mist"
-msgstr "Sisli"
-
-msgid "Mist in the vicinity"
-msgstr "Yer yer sisli"
-
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Airport"
 
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Airport"
 
-msgid "Mo"
-msgstr "Pt"
-
-msgid "Mo I Rana"
-msgstr "Mo I Rana"
-
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-msgid "Mobile"
-msgstr "Cep"
-
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-msgid "Mobile Phone"
-msgstr "Cep Telefonu"
-
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-msgid "Moderate ice crystals"
-msgstr "Orta derecede buzlanma"
-
-msgid "Moderate mist"
-msgstr "Orta derecede sisli"
-
-msgid "Moderate rain"
-msgstr "Orta yağmur"
-
-msgid "Moderate snow"
-msgstr "Orta şiddette kar yağışı"
-
-msgid "Moderate tornado"
-msgstr "Orta şiddette kasırga"
-
-msgid "Moderate volcanic ash"
-msgstr "Orta derecede volkanik kül"
-
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-msgid "Modifying card from LDAP server..."
-msgstr "LDAP sunucudaki kart düzenleniyor..."
+#: my-evolution/Locations.h:1430
+msgid "Mo I Rana"
+msgstr "Mo I Rana"
 
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Airport"
 
-msgid "Monaco"
-msgstr "Monako"
-
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-msgid "Monday"
-msgstr "Pazartesi"
-
-msgid "Mongolia"
-msgstr "Moğolistan"
-
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monpellier-Mediterrannee"
+msgstr "Monpellier-Mediterrannee"
+
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-msgid "Mont-de-Marsan"
-msgstr "Mont-de-Marsan"
-
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
+#: my-evolution/Locations.h:1445
+msgid "Mont-de-Marsan"
+msgstr "Mont-de-Marsan"
+
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-msgid "Monte Malanotte"
-msgstr "Monte Malanotte"
-
-msgid "Monte Scuro"
-msgstr "Monte Scuro"
-
-msgid "Monte Terminillo"
-msgstr "Monte Terminillo"
-
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
+#: my-evolution/Locations.h:1451
+msgid "Monte Malanotte"
+msgstr "Monte Malanotte"
+
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
+#: my-evolution/Locations.h:1454
+msgid "Monte Scuro"
+msgstr "Monte Scuro"
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Terminillo"
+msgstr "Monte Terminillo"
+
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-msgid "Month"
-msgstr "Ay"
-
-msgid "Month View"
-msgstr "Ay Görünümü"
-
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-msgid "Montpellier-Mediterranee"
-msgstr "Monpellier-Mediterrannee"
-
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-msgid "Montserrat"
-msgstr "Montserrat"
-
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-msgid "Morocco"
-msgstr "Morocco"
-
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moscow Domodedovo"
 
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moscow Sheremetyevo"
 
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
+#: my-evolution/Locations.h:1477
+msgid "Mountain Home"
+msgstr "Mountain Home"
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain View"
+msgstr "Mountain View"
+
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-msgid "Mountain Home"
-msgstr "Mountain Home"
-
-msgid "Mountain View"
-msgstr "Mountain View"
-
-msgid "Move"
-msgstr "Taşı"
-
-msgid "Move folder"
-msgstr "Dizini taşı"
-
-msgid "Move message(s) to"
-msgstr "İletileri buraya taşı"
-
-msgid "Move selected messages to another folder"
-msgstr "Seçili iletileri başka bir dizine taşı"
-
-msgid "Move this folder to another place"
-msgstr "Bu dizini başka bir yere taşı"
-
-msgid "Move to Folder"
-msgstr "Dizine Taşı"
-
-msgid "Movemail program failed: %s"
-msgstr "Movemail programında hata: %s"
-
-msgid "Moving"
-msgstr "Taşınıyor"
-
-msgid "Moving messages"
-msgstr "İletiler taşınıyor"
-
-msgid "Moving messages to %s"
-msgstr "İletiler %s'e taşınıyor"
-
-msgid "Mozambique"
-msgstr "Mozambik"
-
-msgid "Mr."
-msgstr "Bay"
-
-msgid "Mrs."
-msgstr "Bn."
-
-msgid "Ms."
-msgstr "Bn."
-
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Muğla/Dalaman"
 
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-msgid "Multiple Messages"
-msgstr "Çoklu İletiler"
-
-msgid "Multiple Unseen Messages"
-msgstr "Çoklu Görülmeyen İleti"
-
-msgid "Multiple VCards"
-msgstr "Çoklu VCard"
-
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Munchen"
 
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-msgid "My Weather"
-msgstr "Hava Durumu"
-
-msgid "Myanmar"
-msgstr "Myanmar"
-
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-msgid "N"
-msgstr "K"
-
-msgid "N Las Vegas"
-msgstr "N Las Vegas"
-
-msgid "N Myrtle Beach"
-msgstr "N Myrtle Beach"
-
-msgid "NNTP Server:"
-msgstr "NNTP _Sunucusu:"
-
-msgid "NT Login"
-msgstr "NT Girişi"
-
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Airport"
 
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya Airport"
 
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha Airport"
 
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-msgid "Name"
-msgstr "İsim"
-
-msgid "Name begins with"
-msgstr "İsim başlar"
-
-msgid "Name:"
-msgstr "İsim:"
-
-msgid "Namespace"
-msgstr "İsim alanı"
-
-msgid "Namibia"
-msgstr "Namibya"
-
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Airport"
 
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-msgid "Nantes Atlantique"
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Naples"
 
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-msgid "Nauru"
-msgstr "Nauru"
-
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-msgid "Needs Action"
-msgstr "İşlem Gerektiriyor"
-
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-msgid "Nepal"
-msgstr "Nepal"
-
-msgid "Netherlands"
-msgstr "Hollanda"
-
-msgid "Netherlands Antilles"
-msgstr "Hollanda Antilleri"
-
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-msgid "New"
-msgstr "Yeni"
-
-msgid "New All Day _Event"
-msgstr "Y_eni Tüm Gün Olayı"
-
-msgid "New Appointment"
-msgstr "Yeni Randevu"
+#: my-evolution/Locations.h:1533
+msgid "Newark"
+msgstr "Newark"
 
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-msgid "New Caledonia"
-msgstr "Yeni Kaledonya"
-
-msgid "New Contact"
-msgstr "Yeni Bağlantı"
-
-msgid "New Contact List"
-msgstr "Yeni Bağlantı Listesi"
-
-msgid "New Contact _List"
-msgstr "Yeni Bağlantı _Listesi"
+#: my-evolution/Locations.h:1538
+msgid "Newburgh"
+msgstr "Newburgh"
 
-msgid "New Contact:"
-msgstr "Yeni Bağlantı:"
+#: my-evolution/Locations.h:1539
+msgid "Newcastle"
+msgstr "Newcastle"
 
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
+#: my-evolution/Locations.h:1541
+msgid "Newfoundland"
+msgstr "Newfoundland"
+
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-msgid "New List"
-msgstr "Yeni Liste"
-
-msgid "New Mail Message"
-msgstr "Yeni İleti"
-
-msgid "New Message"
-msgstr "Yeni İleti"
-
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
+#: my-evolution/Locations.h:1548
+msgid "New Orleans-Lakefront"
+msgstr "New Orleans-Lakefront"
+
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-msgid "New Orleans-Lakefront"
-msgstr "New Orleans-Lakefront"
+#: my-evolution/Locations.h:1550
+msgid "Newport"
+msgstr "Newport"
 
+#: my-evolution/Locations.h:1551
+msgid "Newport News"
+msgstr "Newport News"
+
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-msgid "New Task"
-msgstr "Yeni Görev"
-
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-msgid "New VFolder"
-msgstr "Yeni VDizin"
+#: my-evolution/Locations.h:1555
+msgid "Newton"
+msgstr "Newton"
 
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-msgid "New Zealand"
-msgstr "Yeni Zelanda"
-
-msgid "New _Appointment"
-msgstr "Yeni _Randevu"
-
-msgid "New _Appointment..."
-msgstr "Yeni _Randevu..."
-
-msgid "New _Contact"
-msgstr "Yeni _Bağlantı"
-
-msgid "New _Mail Message"
-msgstr "_Yeni İleti"
-
-msgid "New _Task"
-msgstr "Yeni _Görev"
-
-msgid "New phone type"
-msgstr "Yeni telefon türü"
-
-msgid "New store format:"
-msgstr "Yeni depolama biçimi:"
-
-msgid "New..."
-msgstr "Yeni..."
-
-msgid "Newark"
-msgstr "Newark"
-
-msgid "Newburgh"
-msgstr "Newburgh"
-
-msgid "Newcastle"
-msgstr "Newcastle"
-
-msgid "Newfoundland"
-msgstr "Newfoundland"
-
-msgid "Newport"
-msgstr "Newport"
-
-msgid "Newport News"
-msgstr "Newport News"
-
-msgid "News"
-msgstr "Haberler"
-
-msgid "News Feed"
-msgstr "Haber Grubu"
-
-msgid "News Feed Settings"
-msgstr "Haber Grubu Ayarları"
-
-msgid "Newton"
-msgstr "Newton"
-
-msgid "Next"
-msgstr "İleri"
-
-msgid "Next Important Message"
-msgstr "Sonraki Önemli İleti"
-
-msgid "Next Message"
-msgstr "Sonraki İleti"
-
-msgid "Next Thread"
-msgstr "Sonraki Konum"
-
-msgid "Next Unread Message"
-msgstr "Sonraki Okunmamış İleti"
-
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-msgid "Nicaragua"
-msgstr "Nikaragua"
-
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-msgid "Nick"
-msgstr "Lakap"
-
-msgid "Nickname"
-msgstr "Lakap"
-
-msgid "Niger"
-msgstr "Niger"
-
-msgid "Nigeria"
-msgstr "Nijerya"
-
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Airport"
 
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-msgid "Niue"
-msgstr "Niue"
-
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-msgid "No"
-msgstr "Hayır"
-
-msgid "No Information"
-msgstr "Bilgi Yok"
-
-msgid "No Message Selected"
-msgstr "Hiç İleti Seçilmedi"
-
-msgid "No appointments"
-msgstr "Randevu yok"
-
-msgid "No cards"
-msgstr "Kart yok"
-
-msgid "No description"
-msgstr "Açıklama yok"
-
-msgid "No description available."
-msgstr "Açıklama yok."
-
-msgid "No error"
-msgstr "Hata yok"
-
-msgid "No filename provided."
-msgstr "Dosya adı belirtilmedi."
-
-msgid "No folder name specified."
-msgstr "Dizin adı belirtilmedi"
-
-msgid "No message with uid %s"
-msgstr "%s kullanıcı numarasıyla ileti yok"
-
-msgid "No owner"
-msgstr "Sahibi yok"
-
-msgid "No provider available for protocol `%s'"
-msgstr "`%s' protokolü için alıcı yok"
-
-msgid "No server has been selected"
-msgstr "Hiç sunucu seçilmedi"
-
-msgid "No space left"
-msgstr "Hiç boş alan kalmadı"
-
-msgid "No such folder %s"
-msgstr "Bu isimde bir dizin yok: `%s'"
-
-msgid "No such folder `%s'."
-msgstr "Bu isimde bir dizin yok: `%s'"
-
-msgid "No such message"
-msgstr "İleti bulunmuyor"
-
-msgid "No such message %s in %s"
-msgstr "Bu isimle bir ileti yok: %s (%s)"
-
-msgid "No such message: %s"
-msgstr "Böyle bir ileti yok: %s"
-
-msgid "No summary"
-msgstr "Özet yok"
-
-msgid "No support for authentication type %s"
-msgstr "%s kimlik sınama yöntemi desteklenmiyor"
-
-msgid "No tasks"
-msgstr "Görev yok"
+#: my-evolution/Locations.h:1568
+msgid "N Las Vegas"
+msgstr "N Las Vegas"
 
-msgid "No_tes:"
-msgstr "_Notlar:"
+#: my-evolution/Locations.h:1569
+msgid "N Myrtle Beach"
+msgstr "N Myrtle Beach"
 
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-msgid "Non-Participant"
-msgstr "Katılmayan"
-
-msgid "Non-Participants"
-msgstr "Katılmayanlar"
-
-msgid "None"
-msgstr "Yok"
-
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-msgid "Norfolk Island"
-msgstr "Norfolk Adaları"
-
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-msgid "Normal"
-msgstr "Normal"
-
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-msgid "North"
-msgstr "Kuzey"
-
-msgid "North - NorthEast"
-msgstr "Kuzey - Kuzeydoğu"
-
-msgid "North - Northwest"
-msgstr "Kuzey - Kuzeybatı"
-
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
+#: my-evolution/Locations.h:1581
+msgid "Northeast Philadelphia"
+msgstr "Northeast Philadelphia"
+
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-msgid "Northeast"
-msgstr "Kuzeydoğu"
-
-msgid "Northeast Philadelphia"
-msgstr "Northeast Philadelphia"
-
-msgid "Northern Mariana Islands"
-msgstr "Northern Mariana Adaları"
-
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-msgid "Northwest"
-msgstr "Kuzeybatı"
-
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-msgid "Norway"
-msgstr "Norveç"
-
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-msgid "Not Started"
-msgstr "Başlamadı"
-
-msgid "Not enough space to create the folder"
-msgstr "Dizin yaratmak için gerekli disk alanı yok"
-
-msgid "Not found"
-msgstr "Bulunamadı"
-
-msgid "Note"
-msgstr "Not"
-
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Not: Farklı e-posta biçimleri arasında çeviri yaparken, \n"
-"diskin dolması gibi hatalarda veri kayıpları olabilir.\n"
-"Lütfen bu özelliği dikkatli kullanın."
-
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-msgid "Nova Scotia"
-msgstr "Nova Scotia"
-
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-msgid "November"
-msgstr "Kasım"
+#: my-evolution/Locations.h:1591
+msgid "Nova Scotia"
+msgstr "Nova Scotia"
 
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-msgid "Now"
-msgstr "Şimdi"
-
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-msgid "Number of columns:"
-msgstr "Sütun sayısı:"
-
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-msgid "O'Neill"
-msgstr "O'Neill"
-
-msgid "OK"
-msgstr "Tamam"
-
-msgid "O_verdue tasks:"
-msgstr "_Zamanı geçen görevler:"
-
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Airport"
 
-msgid "Obtain the latest meeting information"
-msgstr "Son toplantı bilgisini al"
-
-msgid "Obtain the latest task information"
-msgstr "Son görev bilgisini al"
-
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-msgid "October"
-msgstr "Ekim"
-
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odesa"
+msgstr "Odense"
+
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-msgid "Off"
-msgstr "Ofis"
-
-msgid "Office"
-msgstr "Ofis"
-
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama Airport"
 
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki Airport"
 
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-msgid "Oman"
-msgstr "Oman"
-
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "%d-%m-%Y %A günü saat %H:%M sularında, %%s dedi ki:"
-
-msgid "One"
-msgstr "Biri"
-
-msgid "One mont_h"
-msgstr "Bi_r ay"
-
-msgid "One w_eek"
-msgstr "B_ir hafta"
+#: my-evolution/Locations.h:1634
+msgid "O'Neill"
+msgstr "O'Neill"
 
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-msgid "Open"
-msgstr "Aç"
-
-msgid "Open Link in Browser"
-msgstr "Bağlantıyı Tarayıcıda Aç"
-
-msgid "Open a file"
-msgstr "Bir dosya aç"
-
-msgid "Open a window for composing a mail message"
-msgstr "İletiyi düzenlemek için bir pencere aç"
-
-msgid "Open file"
-msgstr "Dosyayı aç"
-
-msgid "Open in %s..."
-msgstr "%s içinde aç..."
-
-msgid "Open in New Window"
-msgstr "Yeni Pencerede Aç"
-
-msgid "Open in New _Window"
-msgstr "Y_eni Pencerede Aç"
-
-msgid "Open the folder linked to this shortcut"
-msgstr "Bu kısayola bağlı dizini aç"
-
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Bu kısayola bağlı dizini yeni pencerede aç"
-
-msgid "Open the selected message in a new window"
-msgstr "Seçilen iletiyi yeni bir pencerede aç"
-
-msgid "Open the selected message in the composer to re-send it"
-msgstr "Seçilen iletiyi düzenleyicide yeniden göndermek üzere aç"
-
-msgid "Open this folder in an other window"
-msgstr "Bu dizini yeni bir pencerede aç"
-
-msgid "Opening calendar at %s"
-msgstr "%s tarihinde takvim açılıyor"
-
-msgid "Opening folder %s"
-msgstr "%s dizini açılıyor"
-
-msgid "Opening store %s"
-msgstr "%s deposu açılıyor"
-
-msgid "Opening tasks at %s"
-msgstr "%s tarihinde görevler açılıyor"
-
-msgid "Operation cancelled"
-msgstr "İşlem iptal edildi"
-
-msgid "Operation not supported"
-msgstr "İşlem desteklenmiyor"
-
-msgid "Optional Information"
-msgstr "Seçimlik Bilgi"
-
-msgid "Optional Participant"
-msgstr "Seçimlik Katılımcı"
-
-msgid "Optional Participants"
-msgstr "Seçimlik Katılımcılar"
-
-msgid "Options"
-msgstr "Seçenekler"
-
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-msgid "Org"
-msgstr "Kur"
-
-msgid "Organi_zation:"
-msgstr "_Kurum:"
-
-msgid "Organization"
-msgstr "Kurum"
-
-msgid "Organizer:"
-msgstr "Organizatör:"
-
-msgid "Orientation"
-msgstr "Konum"
-
-msgid "Original Contact:"
-msgstr "Asıl Bağlantı:"
-
-msgid "Original Si_ze"
-msgstr "Asıl Boyut"
-
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka International Airport"
 
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima Airport"
 
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-msgid "Other"
-msgstr "Diğer"
-
-msgid "Other Address"
-msgstr "Diğer Adres"
-
-msgid "Other Contacts"
-msgstr "Diğer Bağlantılar"
-
-msgid "Other Fax"
-msgstr "Başka Fakslar"
-
-msgid "Other Phone"
-msgstr "Diğer Telefonlar"
-
-msgid "Other error"
-msgstr "Diğer hata"
-
-msgid "Other..."
-msgstr "Diğer..."
-
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-msgid "Out of Office"
-msgstr "Ofiste Değil"
-
-msgid "Outbox"
-msgstr "Giden"
-
-msgid "Outgoing"
-msgstr "Giden"
-
-msgid "Output File"
-msgstr "Çıktı Dosyası"
-
-msgid "Overwrite file?"
-msgstr "Dosya üzerine yazılsın mı?"
-
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr " "
 
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-msgid "PGP Encrypt"
-msgstr "PGP Şifre"
-
-msgid "PGP Sign"
-msgstr "PGP İmza"
-
-msgid "PGP _Key ID:"
-msgstr "PGP _Anahtar Numarası:"
-
-msgid "POP"
-msgstr "POP"
-
-msgid "POP Source URI"
-msgstr "POP Kaynak URI adresi"
-
-msgid "POP before SMTP"
-msgstr "SMTP öncesi POP"
-
-msgid "P_rofession:"
-msgstr "_Uzmanlık alanı:"
-
-msgid "Pa Kuei/Bakuai"
-msgstr "Pa Kuei/Bakuai"
-
-msgid "Pacific/Apia"
-msgstr "Pacific/Apia"
-
-msgid "Pacific/Auckland"
-msgstr "Pacific/Auckland"
-
-msgid "Pacific/Chatham"
-msgstr "Pacific/Chatham"
-
-msgid "Pacific/Easter"
-msgstr "Pacific/Easter"
-
-msgid "Pacific/Efate"
-msgstr "Pacific/Efate"
-
-msgid "Pacific/Enderbury"
-msgstr "Pacific/Enderbury"
-
-msgid "Pacific/Fakaofo"
-msgstr "Pacific/Fakaofo"
-
-msgid "Pacific/Fiji"
-msgstr "Pacific/Fiji"
-
-msgid "Pacific/Funafuti"
-msgstr "Pacific/Funafuti"
-
-msgid "Pacific/Galapagos"
-msgstr "Pacific/Galapagos"
-
-msgid "Pacific/Gambier"
-msgstr "Pacific/Gambier"
-
-msgid "Pacific/Guadalcanal"
-msgstr "Pacific/Guadalcanal"
-
-msgid "Pacific/Guam"
-msgstr "Pacific/Guam"
-
-msgid "Pacific/Honolulu"
-msgstr "Pacific/Honolulu"
-
-msgid "Pacific/Johnston"
-msgstr "Pacific/Johnston"
-
-msgid "Pacific/Kiritimati"
-msgstr "Pacific/Kiritimati"
-
-msgid "Pacific/Kosrae"
-msgstr "Pacific/Kosrae"
-
-msgid "Pacific/Kwajalein"
-msgstr "Pacific/Kwajalein"
-
-msgid "Pacific/Majuro"
-msgstr "Pacific/Majuro"
-
-msgid "Pacific/Marquesas"
-msgstr "Pacific/Marquesas"
-
-msgid "Pacific/Midway"
-msgstr "Pacific/Midway"
-
-msgid "Pacific/Nauru"
-msgstr "Pacific/Nauru"
-
-msgid "Pacific/Niue"
-msgstr "Pacific/Niue"
-
-msgid "Pacific/Norfolk"
-msgstr "Pacific/Norfolk"
-
-msgid "Pacific/Noumea"
-msgstr "Pacific/Noumea"
-
-msgid "Pacific/Pago_Pago"
-msgstr "Pacific/Pago_Pago"
-
-msgid "Pacific/Palau"
-msgstr "Pacific/Palau"
-
-msgid "Pacific/Pitcairn"
-msgstr "Pacific/Pitcairn"
-
-msgid "Pacific/Ponape"
-msgstr "Pacific/Ponape"
-
-msgid "Pacific/Port_Moresby"
-msgstr "Pacific/Port_Moresby"
-
-msgid "Pacific/Rarotonga"
-msgstr "Pacific/Rarotonga"
-
-msgid "Pacific/Saipan"
-msgstr "Pacific/Saipan"
-
-msgid "Pacific/Tahiti"
-msgstr "Pacific/Tahiti"
-
-msgid "Pacific/Tarawa"
-msgstr "Pacific/Tarawa"
-
-msgid "Pacific/Tongatapu"
-msgstr "Pacific/Tongatapu"
-
-msgid "Pacific/Truk"
-msgstr "Pacific/Truk"
-
-msgid "Pacific/Wake"
-msgstr "Pacific/Wake"
-
-msgid "Pacific/Wallis"
-msgstr "Pacific/Wallis"
-
-msgid "Pacific/Yap"
-msgstr "Pacific/Yap"
-
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-msgid "Page"
-msgstr "Sayfa"
-
-msgid "Page Setup:"
-msgstr "Sayfa Ayarları:"
-
-msgid "Pager"
-msgstr "Çağrı Cihazı"
-
-msgid "Pakistan"
-msgstr "Pakistan"
+#: my-evolution/Locations.h:1673
+msgid "Pa Kuei/Bakuai"
+msgstr "Pa Kuei/Bakuai"
 
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-msgid "Palau"
-msgstr "Palau"
-
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-msgid "Palestinian Territory"
-msgstr "Filistan Bölgesi"
-
-msgid "Palm Springs"
-msgstr "Palm Springs"
-
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
+#: my-evolution/Locations.h:1679
+msgid "Palm Springs"
+msgstr "Palm Springs"
+
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-msgid "Panama"
-msgstr "Panama"
-
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-msgid "Paper"
-msgstr "Kağıt"
-
-msgid "Paper source:"
-msgstr "Kağıt kaynağı:"
-
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-msgid "Papua New Guinea"
-msgstr "Papua Yeni Gine"
-
-msgid "Paraguay"
-msgstr "Paraguay"
-
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-msgid "Partial mist"
-msgstr "Bölüm bölüm sisli"
-
-msgid "Partial rainfall"
-msgstr "Kısmi yağmurlu"
-
-msgid "Partial volcanic ash"
-msgstr "Kısmi volkanik kül"
-
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-msgid "Passo Resia"
-msgstr "Passo Resia"
-
-msgid "Passo Rolle"
-msgstr "Passo Rolle"
-
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-msgid "Password"
-msgstr "Parola"
-
-msgid "Paste"
-msgstr "Yapıştır"
-
-msgid "Paste message in the clipboard"
-msgstr "İletiyi panoya yapıştır"
-
-msgid "Paste task from the clipboard"
-msgstr "Panodan görevi yapıştır"
-
-msgid "Paste the clipboard"
-msgstr "Panoyu yapıştır"
+#: my-evolution/Locations.h:1698
+msgid "Passo Resia"
+msgstr "Passo Resia"
 
-msgid "Path: %s, Type: %s"
-msgstr "Yol: %s, Tür: %s"
+#: my-evolution/Locations.h:1699
+msgid "Passo Rolle"
+msgstr "Passo Rolle"
 
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-msgid "Penn Yan"
-msgstr "Penn Yan"
-
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
+#: my-evolution/Locations.h:1711
+msgid "Penn Yan"
+msgstr "Penn Yan"
+
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "People's Republic of China"
 
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-msgid "Percent Complete: %i"
-msgstr "Biten Yüzde: %i"
-
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-msgid "Performing query on unknown header: %s"
-msgstr "Bilinmeyen başlık üzerinde arama yapılıyor: %s"
-
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Tüm dizindeki tüm silinmiş iletileri tamamen sil"
-
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Bu dizindeki tüm silinmiş iletileri tamamen sil"
-
-msgid "Permission denied"
-msgstr "İzin yok"
-
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-msgid "Peru"
-msgstr "Peru"
-
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-msgid "Philippines"
-msgstr "Filipinler"
-
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-msgid "Phone List"
-msgstr "Telefon Listesi"
-
-msgid "Phone Types"
-msgstr "Telefon Türleri"
-
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-msgid "Pick a color"
-msgstr "Bir renk seçin"
-
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-msgid "Pine"
-msgstr "Pine"
-
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-msgid "Pitcairn"
-msgstr "Pitcairn"
-
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-msgid "Play a sound"
-msgstr "Bir ses çal"
-
-msgid "Play sound:"
-msgstr "Ses çal:"
-
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Dosyaları kurmak için \"Tamam\" düğmesine, ya da işlemi durdurmak için "
-"\"İptal\" düğmesine tıklayın."
-
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
-msgstr ""
-"Lütfen giden e-posta sunucusu için protokol bilgisini aşağıda belirtin. Eğer "
-"hangi protokolü kullandığınızı \n"
-"bilmiyorsanız sistem yöneticinize, ya da İnternet servis sağlayıcınıza "
-"başvurun."
-
-msgid ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
-msgstr ""
-"Lütfen gelen e-posta sunucusu için bilgi verin. Eğer hangi tür bir sunucu "
-"kullandığınızı bilmiyorsanız sistem \n"
-" yöneticinize, ya da İnternet servis sağlayıcınıza başvurun."
-
-msgid "Please enter your %s passphrase"
-msgstr "Lütfen %s parolanızı girin"
-
-msgid "Please enter your %s passphrase for %s"
-msgstr "Lütfen parolanızı girin: "
-
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
-msgstr ""
-"Lütfen adınızı ve e-posta adresinizi aşağıdaki boşluğa yazın. Göndereceğiniz "
-"e-posta adresinizin içinde görünmesini \n"
-"istemiyorsanız seçimlik alanları doldurmanıza gerek yoktur. "
-
-msgid "Please enter your password for %s"
-msgstr "%s için parolanızı girin"
-
-msgid "Please select a server."
-msgstr "Lütfen bir sunucu seçiniz."
-
-msgid "Please select among the following options"
-msgstr "Aşağıdaki seçeneklerden birisini seçin"
-
-msgid "Please wait"
-msgstr "Lütfen bekleyiniz"
-
-msgid "Please wait..."
-msgstr "Lütfen bekleyiniz..."
-
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-"Lütfen bekleyiniz...\n"
-"Mevcut ayarlar aranıyor"
-
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP adresine bağ (%s)"
-
-msgid "Pointer to local file (%s)"
-msgstr "Yerel dosyaya bağ (%s)"
-
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "%s yerel dosyasına bağ (\"%s\" adresinde geçerli)"
-
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
-
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-msgid "Poland"
-msgstr "Polonya"
-
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
+#: my-evolution/Locations.h:1775
+msgid "Port-Au-Prince"
+msgstr "Port-Au-Prince"
+
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
+#: my-evolution/Locations.h:1777
+msgid "Porterville"
+msgstr "Porterville"
+
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-msgid "Port Said"
-msgstr "Port Said"
-
-msgid "Port-Au-Prince"
-msgstr "Port-Au-Prince"
-
-msgid "Porterville"
-msgstr "Porterville"
-
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
+#: my-evolution/Locations.h:1785
+msgid "Portoroz"
+msgstr "Portoroz"
+
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-msgid "Portoroz"
-msgstr "Portoroz"
-
-msgid "Portrait"
-msgstr "Portre"
+#: my-evolution/Locations.h:1788
+msgid "Port Said"
+msgstr "Port Said"
 
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-msgid "Portugal"
-msgstr "Portekiz"
-
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-msgid "Pretty Good Privacy"
-msgstr "Pretty Good Privacy"
-
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-msgid "Preview"
-msgstr "Önizleme"
-
-msgid "Preview the message to be printed"
-msgstr "Yazdırılacak İletiyi Önizle"
-
-msgid "Preview the printed item"
-msgstr "Yazdırılacak olan öğeyi önizle"
-
-msgid "Preview:"
-msgstr "Önizleme:"
-
-msgid "Previews the calendar to be printed"
-msgstr "Yazdırılacak olan takvimi önizler"
-
-msgid "Previews the contacts to be printed"
-msgstr "Yazdırılacak olan bağlantıları önizler"
-
-msgid "Previous"
-msgstr "Geri"
-
-msgid "Previous Important Message"
-msgstr "Önceki Önemli İleti"
-
-msgid "Previous Message"
-msgstr "Önceki İleti"
-
-msgid "Previous Unread Message"
-msgstr "Önceki Okunmamış İleti"
-
-msgid "Pri_vate"
-msgstr "Ö_zel"
-
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-msgid "Prim"
-msgstr "İlk"
-
-msgid "Primary"
-msgstr "İlk"
-
-msgid "Primary Email"
-msgstr "Birincil E-posta Adresi"
-
-msgid "Primary Phone"
-msgstr "İlk Telefon"
-
-msgid "Print"
-msgstr "Yazdır"
-
-msgid "Print Calendar"
-msgstr "Takvimi Yazdır"
-
-msgid "Print En_velope..."
-msgstr "_Zarfı Yazdır..."
-
-msgid "Print Envelope"
-msgstr "Zarfı Yazdır"
-
-msgid "Print Item"
-msgstr "Öğeyi Yazdır"
-
-msgid "Print Message"
-msgstr "İletiyi Yazdır"
-
-msgid "Print Pre_view"
-msgstr "Yazdırma Ö_nizlemesi"
-
-msgid "Print Preview"
-msgstr "Önizlemeyi Yazdır"
-
-msgid "Print Setup"
-msgstr "Yazdırma Ayarları"
-
-msgid "Print Summary"
-msgstr "Yazdırma Özeti"
-
-msgid "Print card"
-msgstr "Kartı yazdır"
-
-msgid "Print cards"
-msgstr "Kartları yazdır"
-
-msgid "Print envelope"
-msgstr "Zarfı yazdır"
-
-msgid "Print selected contacts"
-msgstr "Seçili bağlantıları yazdır"
-
-msgid "Print summary"
-msgstr "Özeti yazdır"
-
-msgid "Print this calendar"
-msgstr "Bu takvimi yazdır"
-
-msgid "Print this item"
-msgstr "Bu öğeyi yazdır"
-
-msgid "Print this message"
-msgstr "Bu iletiyi yazdır"
-
-msgid "Print using gray shading"
-msgstr "Gri tonlama kullanarak yazdır"
-
-msgid "Print..."
-msgstr "Yazdır..."
-
-msgid "Printing of Summary failed"
-msgstr "Özetin yazdırılmasında hata"
-
-msgid "Printing of message failed"
-msgstr "İletiyi yazdırılmasında hata"
-
-msgid "Priority"
-msgstr "Öncelik"
-
-msgid "Priority: %s"
-msgstr "Öncelik: %s"
-
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-msgid "Private"
-msgstr "Özel"
-
-msgid "Prof"
-msgstr "Prof"
-
-msgid "Profession"
-msgstr "Uzmanlık alanı"
-
-msgid "Program Alarm Options"
-msgstr "Program Alarm Seçenekleri"
-
-msgid "Progress"
-msgstr "İşlem"
-
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr "HTML iletileri istemeyen bağlantılara ileti gönderirken beni _uyar"
-
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "İ_letileri konusuz gönderirken beni uyar"
-
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Sadece _Bcc alıcıların tanımlı olduğu iletileri gönderirken beni uyar"
-
-msgid "Properties"
-msgstr "Özellikler"
-
-msgid "Properties for \"%s\""
-msgstr "\"%s\" özellikleri"
-
-msgid "Properties..."
-msgstr "Özellikler..."
-
-msgid "Protocol not supported"
-msgstr "Protokol desteklenmiyor"
-
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr " Geri"
 
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-msgid "Pu_blic"
-msgstr "_Genel"
-
-msgid "Public"
-msgstr "Genel"
-
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-msgid "Puerto Rico"
-msgstr "Porto Riko"
-
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr " Özet"
 
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-msgid "Qatar"
-msgstr "Katar"
-
-msgid "Qmail maildir "
-msgstr "Qmail dizini "
-
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-msgid "Querying Addressbook..."
-msgstr "Adres Defterini Araştırılıyor..."
-
-msgid "Question"
-msgstr "Soru"
-
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "RCPT TO zaman aşımı: %s: ileti gönderilmedi"
-
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCPT TO zaman aşımı: %s: ileti gönderilmedi"
-
-msgid "RSET request timed out: %s"
-msgstr "RSET isteği zaman aşımına uğradı: %s"
-
-msgid "RSET response error: %s"
-msgstr "RSET cevap hatası: %s"
-
-msgid "RSVP"
-msgstr "RSVP"
-
-msgid "R_efresh time (seconds):"
-msgstr "Tazeleme aralığı (saniye):"
-
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-msgid "Radio"
-msgstr "Radyo"
-
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-msgid "Rain"
-msgstr "Yağmurlu"
-
-msgid "Rain in the vicinity"
-msgstr "Yer yer yağmurlu"
-
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-msgid "Re_fresh Meeting"
-msgstr "T_oplantıyı Tazele"
-
-msgid "Re_fresh Task"
-msgstr "Görevi _Tazele"
-
-msgid "Re_member this password"
-msgstr "_Bu parolayı hatırla"
-
-msgid "Re_move"
-msgstr "_Sil"
-
-msgid "Re_name this Group..."
-msgstr "_Bu Grubu Yeniden Adlandır..."
-
-msgid "Read"
-msgstr "Oku"
-
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-msgid "Really delete account?"
-msgstr "Gerçekten hesap silinsin mi?"
-
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-msgid "Received"
-msgstr "Alındı"
-
-msgid "Receiving Email"
-msgstr "İletiler Alınıyor"
-
-msgid "Receiving LDAP search results..."
-msgstr "LDAP arama sonuçları alınıyor..."
-
-msgid "Receiving Mail"
-msgstr "İletiler Alınıyor"
-
-msgid "Receiving Options"
-msgstr "Alma Seçenekleri"
-
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-msgid "Recipients"
-msgstr "Alıcılar"
-
-msgid "Recipients contain"
-msgstr "Alıcılar içerir"
-
-msgid "Reconfigure /%s"
-msgstr "Yeniden Yapılandır/%s"
-
-msgid "Reconfiguring folder"
-msgstr "Dizin yeniden yapılandırılıyor"
-
-msgid "Reconnecting to %s"
-msgstr "%s adresine bağlantı kuruluyor"
-
-msgid "Recurrence"
-msgstr "Tekrarlama"
-
-msgid "Recurrence Rule"
-msgstr "Tekrarlama Kuralı"
-
-msgid "Recurring"
-msgstr "Tekrarlama"
-
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-msgid "Red Oak"
-msgstr "Red Oak"
-
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
+#: my-evolution/Locations.h:1860
+msgid "Red Oak"
+msgstr "Red Oak"
+
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-msgid "Refresh"
-msgstr "Tazele"
-
-msgid "Refresh List"
-msgstr "Listeyi Tazele"
-
-msgid "Refresh List of Folders"
-msgstr "Dizin Listesini Tazele"
-
-msgid "Refresh _time (seconds):"
-msgstr "Tazeleme _aralığı (saniye):"
-
-msgid "Refreshing folder"
-msgstr "Dizin tazeleniyor"
-
-msgid "Regex Match"
-msgstr "Düzgün Deyim Eşleşimi"
-
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-msgid "Regions"
-msgstr "Bölgeler"
-
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Düzgün deyim derleme işlemi başarısız: %s: %s"
-
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-msgid "Reload"
-msgstr "Tekrar yükle"
-
-msgid "Reload the view"
-msgstr "Görünümü tekrar yükle"
-
-msgid "Remember this password"
-msgstr "Bu parolayı hatırla"
-
-msgid "Remember this password for the remainder of this session"
-msgstr "Bu oturumun sonuna kadar girilen parolayı hatırla"
-
-msgid "Reminder"
-msgstr "Hatırlatıcı"
-
-msgid "Reminders"
-msgstr "Hatırlatıcılar"
-
-msgid "Removal Complete"
-msgstr "Bitiş Tamamlandı"
-
-msgid "Remove"
-msgstr "Sil"
-
-msgid "Remove All"
-msgstr "Tümünü Sil"
-
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Bu dizini üye diziler listesinden sil"
-
-msgid "Remove selected items from the attachment list"
-msgstr "Seçili dosyaları ekler listesinden sil"
-
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Bu kısayolu kısayol çubuğundan sil"
-
-msgid "Remove this shortcut group"
-msgstr "Bu kısayol grubunu sil"
-
-msgid "Removing card from LDAP server..."
-msgstr "LDAP sunucudaki kart siliniyor..."
-
-msgid "Removing folder %s"
-msgstr "%s dizini siliniyor"
-
-msgid "Rename Shortcut Group"
-msgstr "Kısayol Grubunu Yeniden İsimlendir"
-
-msgid "Rename folder"
-msgstr "Dizini yeniden adlandır"
-
-msgid "Rename selected shortcut group to:"
-msgstr "Seçili kısayol grubunu yeniden isimlendir:"
-
-msgid "Rename selected shortcut to:"
-msgstr "Seçili kısayolları yeniden isimlendir:"
-
-msgid "Rename shortcut"
-msgstr "Kısayolu yeniden isimlendir"
-
-msgid "Rename the \"%s\" folder to:"
-msgstr "\"%s\" dizinini yeniden adlandır:"
-
-msgid "Rename this shortcut"
-msgstr "Bu kısayolu yeniden isimlendir"
-
-msgid "Rename this shortcut group"
-msgstr "Bu kısayol grubunu yeniden isimlendir"
-
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-msgid "Repeat the alarm"
-msgstr "Alarmı tekrar et"
-
-msgid "Replied to"
-msgstr "Cevaplanan"
-
-msgid "Reply"
-msgstr "Cevapla"
-
-msgid "Reply to All"
-msgstr "Herkese cevapla"
-
-msgid "Reply to _All"
-msgstr "_Herkese Cevapla"
-
-msgid "Reply to _List"
-msgstr "_Listeye Cevapla"
-
-msgid "Reply-To"
-msgstr "Yanıtla:"
-
-msgid "Reply-To:"
-msgstr "Cevapla:"
-
-msgid "Repository offline"
-msgstr "Depo çevrimdışı"
-
-msgid "Requested action aborted: error in processing"
-msgstr "İstenen eylem iptal edildi: işlem sırasında hata"
-
-msgid "Requested action not taken: insufficient system storage"
-msgstr "İstenen eylem yapılmadı: disk alanı yetersiz"
-
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "İstenen eylem yapılmadı: e-posta kutusu izni yok"
-
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "İstenen eylem yapılmadı: posta kutusu bulunamadı"
-
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "İstenen eylem iptal edildi: disk alanı yetersiz"
-
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "İstenen ileti eylemi yapılmadı: posta kutusu bulunamadı"
-
-msgid "Requested mail action okay, completed"
-msgstr "İstenen ileti işlemi tamamlandı"
-
-msgid "Required Information"
-msgstr "İstenen Bilgiler"
-
-msgid "Required Participant"
-msgstr "Gerekli Katılımcı"
-
-msgid "Required Participants"
-msgstr "Gerekli Katılımcılar"
-
-msgid "Required People and _One Resource"
-msgstr "Gerekli Kişiler ve _Bir Kaynak"
-
-msgid "Reset the text to its original size"
-msgstr "Metni orjinal boyuna getir"
-
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-msgid "Resolving: %s"
-msgstr "Çözümleniyor: %s"
-
-msgid "Resource"
-msgstr "Kaynak"
-
-msgid "Restarting search."
-msgstr "Arama yeniden başlatılıyor."
-
-msgid "Resynchronizing with server"
-msgstr "Sunucu ile eşzamanlama yapılıyor"
-
-msgid "Retrieving %d message(s)"
-msgstr "%d ileti alınıyor"
-
-msgid "Retrieving POP message %d"
-msgstr "%d. POP iletisi alınıyor"
-
-msgid "Retrieving POP summary"
-msgstr "POP özeti alınıyor"
-
-msgid "Retrieving message %s"
-msgstr "%s numaralı ileti alınıyor"
-
-msgid "Reunion"
-msgstr "Reunion"
-
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-msgid "Reverse on even pages"
-msgstr "Çift sayfalarda ters çevir"
-
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-msgid "Riga"
-msgstr "Rivas"
-
-msgid "Right:"
-msgstr "Sağ:"
-
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-msgid "Rio / Jacarepagua"
-msgstr "Rio / Jacarepagua"
-
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
+#: my-evolution/Locations.h:1886
+msgid "Rio / Jacarepagua"
+msgstr "Rio / Jacarepagua"
+
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
+#: my-evolution/Locations.h:1894
+#, fuzzy
+msgid "Rivne"
+msgstr "Rivera"
+
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-msgid "Rock Springs"
-msgstr "Rock Springs"
-
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
+#: my-evolution/Locations.h:1904
+msgid "Rock Springs"
+msgstr "Rock Springs"
+
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-msgid "Role"
-msgstr "Görev"
-
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-msgid "Romania"
-msgstr "Romanya"
-
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-msgid "Room"
-msgstr "Oda"
-
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-msgid "Rule name: "
-msgstr "Kural adı:"
-
-msgid "Rules"
-msgstr "Görevler"
-
-msgid "Run a program"
-msgstr "Bir program çalıştır"
-
-msgid "Run program:"
-msgstr "Program çalıştır:"
-
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Russia"
 
-msgid "Russian Federation"
-msgstr "Rusya Federasyonu"
-
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-msgid "Rwanda"
-msgstr "Ruanda"
-
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-msgid "S"
-msgstr "G"
-
-msgid "S/MIME Encrypt"
-msgstr "S/MIME Şifreleme"
-
-msgid "S/MIME Sign"
-msgstr "S/MIME İmza"
-
-msgid "SMTP"
-msgstr "SMTP"
-
-msgid "SMTP Authentication"
-msgstr "SMTP Kimlik Denetimi"
-
-msgid "SMTP Greeting"
-msgstr "SMTP Karşılaması"
-
-msgid "SMTP mail delivery via %s"
-msgstr "%s üzerinden STMP ileti gönderimi"
-
-msgid "SMTP server %s"
-msgstr "SMTP sunucu %s"
-
-msgid "SMTWTFS"
-msgstr "PPSÇPCCP"
-
-msgid "S_earch Message..."
-msgstr "İle_tide Ara..."
-
-msgid "S_how full path for folders"
-msgstr "Dizinlerin tam yolunu göster"
-
-msgid "S_maller"
-msgstr "_Daha küçük"
-
-msgid "Sa"
-msgstr "Ct"
-
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-msgid "Saint Kitts And Nevis"
-msgstr "Saint Kitts And Nevis"
-
-msgid "Saint Lucia"
-msgstr "Saint Lucia"
-
-msgid "Saint Mary's"
-msgstr "Saint Mary's"
-
-msgid "Saint Mawgan"
-msgstr "Saint Mawgan"
-
-msgid "Saint Paul"
-msgstr "Saint Paul"
-
-msgid "Saint Vincent And The Grena-dines"
-msgstr "Saint Vincent And The Grena-dines"
-
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
+#: my-evolution/Locations.h:1943
+msgid "Saint Mary's"
+msgstr "Saint Mary's"
+
+#: my-evolution/Locations.h:1944
+msgid "Saint Mawgan"
+msgstr "Saint Mawgan"
+
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
+#: my-evolution/Locations.h:1946
+msgid "Saint Paul"
+msgstr "Saint Paul"
+
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-msgid "Salt Lake City"
-msgstr "Salt Lake City"
-
-msgid "Salt point"
-msgstr "Salt point"
-
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
+#: my-evolution/Locations.h:1959
+msgid "Salt Lake City"
+msgstr "Salt Lake City"
+
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
+#: my-evolution/Locations.h:1961
+msgid "Salt point"
+msgstr "Salt point"
+
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-msgid "Samoa"
-msgstr "Samoa"
-
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
+#: my-evolution/Locations.h:1967
+msgid "Sana'A"
+msgstr "Sana'A"
+
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
+#: my-evolution/Locations.h:1975
+msgid "Sandane"
+msgstr "Sandane"
+
+#: my-evolution/Locations.h:1976
+msgid "Sandberg"
+msgstr "Sandberg"
+
+#: my-evolution/Locations.h:1977
+msgid "Sanderson"
+msgstr "Sanderson"
+
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
+#: my-evolution/Locations.h:1984
+msgid "Sandnessjoen/Stokka"
+msgstr "Sandnessjoen/Stokka"
+
+#: my-evolution/Locations.h:1985
+msgid "Sand Point"
+msgstr "Sand Point"
+
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
+#: my-evolution/Locations.h:1987
+msgid "Sanford"
+msgstr "Sanford"
+
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
+#: my-evolution/Locations.h:1989
+msgid "Sangju"
+msgstr "Sangju"
+
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
+#: my-evolution/Locations.h:1997
+msgid "Sankt-Peterburg"
+msgstr "Sankt-Peterburg"
+
+#: my-evolution/Locations.h:1998
+msgid "Sanliurfa"
+msgstr "Şanlıurfa"
+
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-msgid "San Marino"
-msgstr "San Marino"
-
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-msgid "Sana'A"
-msgstr "Sana'A"
-
-msgid "Sand"
-msgstr "Kumlu"
-
-msgid "Sand Point"
-msgstr "Sand Point"
-
-msgid "Sandane"
-msgstr "Sandane"
-
-msgid "Sandberg"
-msgstr "Sandberg"
-
-msgid "Sanderson"
-msgstr "Sanderson"
-
-msgid "Sandnessjoen/Stokka"
-msgstr "Sandnessjoen/Stokka"
-
-msgid "Sanford"
-msgstr "Sanford"
-
-msgid "Sangju"
-msgstr "Sangju"
-
-msgid "Sankt-Peterburg"
-msgstr "Sankt-Peterburg"
-
-msgid "Sanliurfa"
-msgstr "Şanlıurfa"
-
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-msgid "Santa Rosa"
-msgstr "Santa Rosa"
-
-msgid "Santa Rosa de Copan"
-msgstr "Santa Rosa de Copan"
-
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
+#: my-evolution/Locations.h:2014
+msgid "Santa Rosa"
+msgstr "Santa Rosa"
+
+#: my-evolution/Locations.h:2015
+msgid "Santa Rosa de Copan"
+msgstr "Santa Rosa de Copan"
+
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-msgid "Santiago Del Estero"
-msgstr "Santiago Del Estero"
-
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
+#: my-evolution/Locations.h:2018
+msgid "Santiago Del Estero"
+msgstr "Santiago Del Estero"
+
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-msgid "Sao Tome And Principe"
-msgstr "Sao Tome And Principe"
-
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-msgid "Saturday"
-msgstr "Cumartesi"
-
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-msgid "Saudi Arabia"
-msgstr "Suudi Arabistan"
-
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-msgid "Save"
-msgstr "Kaydet"
-
-msgid "Save As"
-msgstr "Farklı Kaydet"
-
-msgid "Save As..."
-msgstr "Farklı Kaydet..."
-
-msgid "Save Attachment"
-msgstr "Eki Kaydet"
-
-msgid "Save Contact as VCard"
-msgstr "Bağlantıyı VCard olarak kaydet"
-
-msgid "Save Image as..."
-msgstr "Resmi Farklı Kaydet..."
-
-msgid "Save Link as (FIXME)"
-msgstr "Bağlantıyı Farklı Kaydet"
-
-msgid "Save List as VCard"
-msgstr "Listeyi VCard Olarak Kaydet"
-
-msgid "Save Message As..."
-msgstr "İletiyi Farklı Kaydet..."
-
-msgid "Save Messages As..."
-msgstr "İletileri Farklı Kaydet..."
-
-msgid "Save Search"
-msgstr "Aramayı Kaydet"
-
-msgid "Save _As..."
-msgstr "_Farklı Kaydet..."
-
-msgid "Save _Draft"
-msgstr "_Taslağı Kaydet"
-
-msgid "Save and Close"
-msgstr "Kaydet ve Kapat"
-
-msgid "Save as VCard"
-msgstr "VCard olarak kaydet"
-
-msgid "Save as..."
-msgstr "Farklı kaydet..."
-
-msgid "Save in addressbook"
-msgstr "Adres Defterine kaydet"
-
-msgid "Save in folder..."
-msgstr "Dizine kaydet..."
-
-msgid "Save selected contacts as a VCard."
-msgstr "Seçili bağlantıları vCard olarak kaydet"
-
-msgid "Save signature"
-msgstr "İmzayı kaydet"
-
-msgid "Save the contact and close the dialog box"
-msgstr "Bağlantıyı kaydet ve diyalog penceresini kapat"
-
-msgid "Save the current file"
-msgstr "Şimdiki zamanı kaydet"
-
-msgid "Save the current file with a different name"
-msgstr "Güncel dosyayı farklı bir isimle kaydet"
-
-msgid "Save the item and close the dialog box"
-msgstr "Öğeyi kaydet ve iletişim penceresini kapat"
-
-msgid "Save the list and close the dialog box"
-msgstr "Listeyi kaydet ve iletişim penceresini kapat"
-
-msgid "Save the message as a text file"
-msgstr "İletiyi bir dosyaya kaydet"
-
-msgid "Save the message in a specified folder"
-msgstr "İletiyi belirtilen dizine kaydet"
-
-msgid "Save this item to disk"
-msgstr "Bu öğeyi diske kaydet"
-
-msgid "Save to Disk..."
-msgstr "Diske Kaydet..."
-
-msgid "Saving %d messsage(s)"
-msgstr "%d ileti kaydediliyor"
-
-msgid "Saving attachment"
-msgstr "Ek kaydediliyor"
-
-msgid "Saving message to folder"
-msgstr "İletiler dizine kaydediliyor"
-
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-msgid "Scanning %s"
-msgstr "%s taranıyor"
-
-msgid "Scanning directory"
-msgstr "Dizin taranıyor"
-
-msgid "Scanning folders in \"%s\""
-msgstr "\"%s\" içinde dizinler taranıyor"
-
-msgid "Scanning for changed messages"
-msgstr "Değiştirilen iletiler taranıyor"
-
-msgid "Scanning for new messages"
-msgstr "Yeni iletiler taranıyor"
-
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-msgid "Scattered clouds"
-msgstr "Dağınık bulutlu"
-
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-msgid "Schedule _Meeting"
-msgstr "Toplantı Zamanı Düzenle"
-
-msgid "Schedule a meeting for this item"
-msgstr "Bu öğe _için toplantı zamanı düzenle"
-
-msgid "Scheduling"
-msgstr "Zaman Düzenleme"
-
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-msgid "Score"
-msgstr "Puan"
-
-msgid "Score Rules"
-msgstr "Puan Kuralları"
-
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-msgid "Se_nd list to other..."
-msgstr "L_isteyi başkasına gönder..."
-
-msgid "Sear_ch"
-msgstr "_Ara"
-
-msgid "Search"
-msgstr "Ara"
-
-msgid "Search Editor"
-msgstr "Arama Düzenleyici"
-
-msgid "Search Forward"
-msgstr "İleri Doğru Arat"
-
-msgid "Search for text in the body of the displayed message"
-msgstr "Görüntülenen ileti içinde bir metin ara"
-
-msgid "Searching"
-msgstr "Arıyor"
-
-msgid "Searching..."
-msgstr "Aranıyor..."
-
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-msgid "Sections:"
-msgstr "Bölümler:"
-
-msgid "Secure MIME"
-msgstr "Güvenli MIME"
-
-msgid "Security"
-msgstr "Güvenlik"
-
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-msgid "Seen"
-msgstr "Görünen"
-
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-msgid "Select All"
-msgstr "Hepsini Seç"
-
-msgid "Select Contacts from Addressbook"
-msgstr "Adres Defterinden Bağlantıları Seç"
-
-msgid "Select Filter Log file..."
-msgstr "Filtre Günlük Dosyasını Seçin..."
-
-msgid "Select Folder"
-msgstr "Dizini Seçin"
-
-msgid "Select Importers (step 2 of 3)"
-msgstr "Aktarıcıları Seçin (adım 2/3)"
-
-msgid "Select Names"
-msgstr "İsimleri Seçin"
-
-msgid "Select PGP binary"
-msgstr "PGP programını seçin"
-
-msgid "Select _All"
-msgstr "Tümünü _Seç"
-
-msgid "Select _Thread"
-msgstr "Konumu _Seç"
-
-msgid "Select a File (step 2 of 3)"
-msgstr "Bir dosya seçin (adım 2/3)"
-
-msgid "Select a Time Zone"
-msgstr "Bir Zaman Dilimi Seçin"
-
-msgid "Select a destination folder for importing this data"
-msgstr "Bu veriyi almak için hedef dizin seçin"
-
-msgid "Select a file"
-msgstr "Bir dosya seçin"
-
-msgid "Select all contacts"
-msgstr "Tüm Bağlantıkları Seç"
-
-msgid "Select all visible messages"
-msgstr "Tüm görünen iletileri seç"
-
-msgid "Select an Action"
-msgstr "Bir Eylem Seçin"
-
-msgid "Select folder"
-msgstr "Dizini seçin"
-
-msgid "Select the folder that you want to open"
-msgstr "Açmak istediğiniz dizini seçin"
-
-msgid "Select the folder you want the shortcut to point to:"
-msgstr "Kısayolu işaret etmek istediğiniz dizini seçin:"
-
-msgid "Selected day (%a %b %d %Y)"
-msgstr "Seçili gün (%d %b %a %Y)"
-
-msgid "Selected month (%b %Y)"
-msgstr "Seçili ay (%b %Y)"
-
-msgid "Selected week (%s - %s)"
-msgstr "Seçili hafta (%s - %s)"
-
-msgid "Selected year (%Y)"
-msgstr "Seçili yıl (%Y)"
-
-msgid "Selection:"
-msgstr "Seçim:"
-
-msgid "Send"
-msgstr "Gönder"
-
-msgid "Send & Receive Mail"
-msgstr "İletileri Al ve Gönder"
-
-msgid "Send / Receive"
-msgstr "Al / Gönder"
-
-msgid "Send Free/Busy Information"
-msgstr "Boş/Meşgul Bilgisi Gönder"
-
-msgid "Send HTML Mail?"
-msgstr "HTML Posta Gönderilsin mi?"
-
-msgid "Send Latest Information"
-msgstr "Güncel Bilgiyi Gönder"
-
-msgid "Send Message to Contact"
-msgstr "Bağlantıya İleti Gönder"
-
-msgid "Send _Later"
-msgstr "_Sonra Gönder"
-
-msgid "Send _Message to Contact..."
-msgstr "B_ağlantıya Mesaj Gönder..."
-
-msgid "Send _later"
-msgstr "_Sonra gönder"
-
-msgid "Send _message to list..."
-msgstr "İletiyi _listeye gönder..."
-
-msgid "Send a mess to the selected contacts."
-msgstr "Seçilen bağlantılara bir mesaj gönder."
-
-msgid "Send an email"
-msgstr "Bir e-posta gönder"
-
-msgid "Send anyway?"
-msgstr "Yine de gönderilsin mi?"
-
-msgid "Send message to contact"
-msgstr "Bağlantıya ileti gönder"
-
-msgid "Send queued mail and retrieve new mail"
-msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
-
-msgid "Send selected contacts to another person."
-msgstr "Seçilen bağlantıları başkasına gönder."
-
-msgid "Send the debugging output of all components to a file."
-msgstr "Tüm hata ayıklama verilerini bir dosyaya yazdır."
-
-msgid "Send the mail in HTML format"
-msgstr "İletiyi HTML olarak gönder"
-
-msgid "Send the message later"
-msgstr "Bu iletiyi sonra gönder"
-
-msgid "Send this message now"
-msgstr "Bu iletiyi şimdi gönder"
-
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai Airport"
 
-msgid "Sender"
-msgstr "Gönderen"
-
-msgid "Sender contains"
-msgstr "Gönderen içerir"
-
-msgid "Sending \"%s\""
-msgstr "\"%s\" gönderiliyor"
-
-msgid "Sending Email"
-msgstr "İleti Gönderiliyor"
-
-msgid "Sending Mail"
-msgstr "İleti Gönderiliyor"
-
-msgid "Sending message"
-msgstr "İleti gönderiliyor"
-
-msgid "Sending message %d of %d"
-msgstr "%d / %d ileti gönderiliyor"
-
-msgid "Sendmail"
-msgstr "Sendmail"
-
-msgid "Senegal"
-msgstr "Senegal"
-
-msgid "Sent"
-msgstr "Gönderilen"
-
-msgid "Sent _messages folder:"
-msgstr "_Gönderilen iletiler dizini:"
-
-msgid "Sent and Draft Messages"
-msgstr "Gönderilen ve Taslak İletileri"
-
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O International Airport"
 
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-msgid "September"
-msgstr "Eylül"
-
-msgid "Ser_ver requires authentication"
-msgstr "S_unucu kimlik denetimi istiyor"
-
-msgid "Server Configuration"
-msgstr "Sunucu Yapılandırması"
-
-msgid "Server Message:"
-msgstr "Sunucu Mesajı:"
-
-msgid "Server _Type: "
-msgstr "Su_nucu Türü: "
-
-msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Sunucudan hatalı \"Quality of Protection\" anahtarı geldi\n"
-
-msgid "Server challenge invalid\n"
-msgstr "Sunucudan hatalı cevap\n"
-
-msgid "Server challenge too long (>2048 octets)\n"
-msgstr "Sunucu cevabı çok uzun (>2048 bayt)\n"
-
-msgid "Server response contained incomplete authorization data\n"
-msgstr "Sunucu cevabı yetersiz kimlik denetim bilgisis içeriyor\n"
-
-msgid "Server response did not contain authorization data\n"
-msgstr "Sunucu cevabı kimlik denetim bilgisi içermiyor\n"
-
-msgid "Server response does not match\n"
-msgstr "Sunucu cevabı uyuşmuyor\n"
-
-msgid "Server response ended too soon."
-msgstr "Sunucu cevabı çok erken bitti."
-
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
-
-msgid "Server: %s, Type: %s"
-msgstr "Sunucu: %s, Tür: %s"
-
-msgid "Service closing transmission channel"
-msgstr "Servis iletişim kanalını kapatıyor"
-
-msgid "Service not available, closing transmission channel"
-msgstr "Servis uygun değil, iletişim kanalı kapatılıyor"
-
-msgid "Service ready"
-msgstr "Servis hazır"
-
-msgid "Set Status"
-msgstr "Durum belirt"
-
-msgid "Setting up vfolder: %s"
-msgstr "VDizin yaratılıyor: %s"
-
-msgid "Settings"
-msgstr "Ayarlar"
-
-msgid "Setup the page settings for your current printer"
-msgstr "Güncel yazıcı için sayfa ayarlarını yap"
-
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-msgid "Seychelles"
-msgstr "Seyşeller"
-
-msgid "Sh_ow Hidden Messages"
-msgstr "_Gizli İletileri Göster"
-
-msgid "Shading"
-msgstr "Tonlama"
-
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-msgid "Shortcuts"
-msgstr "Kısayollar"
-
-msgid "Show / hide attachments"
-msgstr "Ekleri göster/gizle"
-
-msgid "Show All"
-msgstr "Hepsini Göster"
-
-msgid "Show Details"
-msgstr "Ayrıntıları Göster"
-
-msgid "Show Email _Source"
-msgstr "İleti _Kaynağını Göster"
-
-msgid "Show Full _Headers"
-msgstr "_Kapsamlı Başlıkları Göster"
-
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-msgid "Show Time As"
-msgstr "Zamanı Farklı Göster"
-
-msgid "Show _Only Working Hours"
-msgstr "_Sadece Çalışma Saatlerini Göster"
-
-msgid "Show _Zoomed Out"
-msgstr "_Uzaklaştırılmış Göster"
-
-msgid "Show _all tasks"
-msgstr "Tüm _görevleri göster"
-
-msgid "Show _attachments"
-msgstr "Ekleri _göster"
-
-msgid "Show _today's tasks"
-msgstr "_Bugünün görevlerini göster"
-
-msgid "Show attachments"
-msgstr "Ekleri göster"
-
-msgid "Show contacts matching the following criteria:"
-msgstr "Aşağıdaki sınıflandırmalara uyan bağlantıları göster:"
-
-msgid "Show information about Ximian Evolution"
-msgstr "Ximian Evolution hakkında bilgi ver"
-
-msgid "Show message in the normal style"
-msgstr "İletiyi normal biçemde göster"
-
-msgid "Show message preview window"
-msgstr "İleti önizleme penceresini göster"
-
-msgid "Show message with all email headers"
-msgstr "İletiyi tüm başlıklarıyla göster"
-
-msgid "Show messages that have been temporarily hidden"
-msgstr "Geçici olarak gizlenmiş iletileri göster"
-
-msgid "Show one day"
-msgstr "Bir gün göster"
-
-msgid "Show one month"
-msgstr "Bir ay göster"
-
-msgid "Show one week"
-msgstr "Bir hafta göster"
-
-msgid "Show only subscribed folders"
-msgstr "Sadece üye olunan dizinleri göster"
-
-msgid "Show temperatures in:"
-msgstr "Sıcaklığı göster:"
-
-msgid "Show the raw email source of the message"
-msgstr "İletinin kaynağını göster"
-
-msgid "Show the shortcuts as large icons"
-msgstr "Kısayolları büyük simgeler olarak göster"
-
-msgid "Show the shortcuts as small icons"
-msgstr "Kısayolları küçük simgeler olarak göster"
-
-msgid "Show the working week"
-msgstr "Çalışma günlerini göster"
-
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-msgid "Sierra Leone"
-msgstr "Sierra Leone"
-
-msgid "Sign this message with your PGP key"
-msgstr "PGP anahtarıyla bu iletiyi imzala"
-
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "S/MIME imza sertifikasıyla bu iletiyi imzala"
-
-msgid "Signature file:"
-msgstr "İmza dosyası:"
-
-msgid "Signing is not supported by this cipher"
-msgstr "Bu şifreleme ile imza desteklenmiyor"
-
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-msgid "Simplified"
-msgstr "Basitleştirilmiş"
-
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-msgid "Singapore"
-msgstr "Singapur"
-
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitkaz"
 
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-msgid "Size"
-msgstr "Boyut"
-
-msgid "Size (kB)"
-msgstr "Boyut (Kb)"
-
-msgid "Size:"
-msgstr "Boyut:"
-
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-msgid "Slovakia"
-msgstr "Slovakya"
-
-msgid "Slovenia"
-msgstr "Slovenya"
-
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-msgid "Snooze time (minutes)"
-msgstr "Dinlenme zamanı (dakika)"
-
-msgid "Snow"
-msgstr "Karlı"
-
-msgid "Snow in the vicinity"
-msgstr "Yer yer kar yağışı"
-
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-msgid "Snowstorm"
-msgstr "Kar fırtınası"
-
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-msgid "Solomon Islands"
-msgstr "Solomon Adaları"
-
-msgid "Somalia"
-msgstr "Somali"
-
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr " Gönderen"
 
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-msgid "Source"
-msgstr "Kaynak"
-
-msgid "Source Account"
-msgstr "Kaynak Hesap"
-
-msgid "Source Information"
-msgstr "Kaynak Bilgisi"
-
-msgid "Sources"
-msgstr "Kaynaklar"
-
-msgid "South"
-msgstr "Güney"
-
-msgid "South - Southeast"
-msgstr "Güney - Güneydoğu"
-
-msgid "South - Southwest"
-msgstr "Güney - Güneybatı"
-
-msgid "South Africa"
-msgstr "Güney Afrika"
+#: my-evolution/Locations.h:2118
+msgid "Southampton"
+msgstr "Southampton"
 
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "South Georgia And The South Sandwich Adaları"
+#: my-evolution/Locations.h:2122
+msgid "Southend"
+msgstr "Southend"
 
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-msgid "Southampton"
-msgstr "Southampton"
-
-msgid "Southeast"
-msgstr "Güneydoğu"
-
-msgid "Southend"
-msgstr "Southend"
-
-msgid "Southwest"
-msgstr "Güneybatı"
-
-msgid "Spain"
-msgstr "İspanya"
-
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-msgid "Special Folders"
-msgstr "Özel Dizinler"
-
-msgid "Specific header"
-msgstr "Özel başlık"
-
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "\"%s\" dizinini kopyalamak için bir dizin adı verin:"
-
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "\"%s\" dizinini taşımak için bir dizin adı verin:"
-
-msgid "Specify where to create the folder:"
-msgstr "Dizinin nerede yaratılacağını belirtin:"
-
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-msgid "Spouse"
-msgstr "Eş"
-
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-msgid "Sr."
-msgstr "Sr."
-
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
-
-msgid "St Cloud"
-msgstr "St Cloud"
-
-msgid "St Johnsbury"
-msgstr "St Johnsbury"
-
-msgid "St Joseph"
-msgstr "St Joseph"
-
-msgid "St Louis"
-msgstr "St Louis"
-
-msgid "St Louis-Spirit"
-msgstr "St Louis-Spirit"
-
-msgid "St Paul"
-msgstr "St Paul"
-
-msgid "St Petersburg"
-msgstr "St Petersburg"
-
-msgid "St Petersburg / Clearwater"
-msgstr "St Petersburg / Clearwater"
-
-msgid "St Simon's Island"
-msgstr "St Simon's Island"
-
-msgid "St. George"
-msgstr "St. George"
-
-msgid "St. Helena"
-msgstr "St. Helena"
-
-msgid "St. John's"
-msgstr "St. John's"
-
-msgid "St. Pierre And Miquelon"
-msgstr "St. Pierre And Miquelon"
-
-msgid "Sta_rt Date:"
-msgstr "_Başlangıç Tarihi:"
-
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-msgid "Standard Unix mbox"
-msgstr "Standart UNIX posta kutusu dosyası"
-
-msgid "Standard Unix mbox spools"
-msgstr "Standart UNIX posta kutusu dosyası"
-
-msgid "Start Date"
-msgstr "Başlangıç Tarihi"
-
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "İleti başlangıcını girin, <CRLF>.<CRLF> ile bitirin."
-
-msgid "Start on a new page"
-msgstr "Yeni bir sayfada başla"
-
-msgid "Starting Intelligent Importers"
-msgstr "Akıllı Aktarımcılar Başlatılıyor"
-
-msgid "Starting import"
-msgstr "Aktarma işlemi başlıyor"
-
-msgid "Starting:"
-msgstr "Başlangıç:"
-
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-msgid "Status"
-msgstr "Durum"
-
-msgid "Status:"
-msgstr "Durum:"
-
-msgid "Status: %s"
-msgstr "Durum: %s"
-
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
+#: my-evolution/Locations.h:2141
+msgid "St Cloud"
+msgstr "St Cloud"
+
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
+#: my-evolution/Locations.h:2144
+msgid "St. George"
+msgstr "St. George"
+
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
+#: my-evolution/Locations.h:2146
+msgid "St. John's"
+msgstr "St. John's"
+
+#: my-evolution/Locations.h:2147
+msgid "St Johnsbury"
+msgstr "St Johnsbury"
+
+#: my-evolution/Locations.h:2148
+msgid "St Joseph"
+msgstr "St Joseph"
+
+#: my-evolution/Locations.h:2149
+msgid "St Louis"
+msgstr "St Louis"
+
+#: my-evolution/Locations.h:2150
+msgid "St Louis-Spirit"
+msgstr "St Louis-Spirit"
+
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-msgid "Stop"
-msgstr "Dur"
-
-msgid "Stop Loading"
-msgstr "Yüklemeyi Durdur"
-
-msgid "Stop Processing"
-msgstr "İşlemeyi Durdur"
-
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-msgid "Store root %s is not a regular directory"
-msgstr "%s saklama dizini geçersiz"
-
-msgid "Store root %s is not an absolute path"
-msgstr "%s saklama dizininde hata"
-
-msgid "Storing folder '%s'"
-msgstr "'%s' dizinine kaydediliyor"
-
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
+#: my-evolution/Locations.h:2158
+msgid "St Paul"
+msgstr "St Paul"
+
+#: my-evolution/Locations.h:2159
+msgid "St Petersburg"
+msgstr "St Petersburg"
+
+#: my-evolution/Locations.h:2160
+msgid "St Petersburg / Clearwater"
+msgstr "St Petersburg / Clearwater"
+
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
+#: my-evolution/Locations.h:2163
+msgid "St Simon's Island"
+msgstr "St Simon's Island"
+
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-msgid "Style name:"
-msgstr "Stil adı:"
-
-msgid "Su"
-msgstr "Pz"
-
-msgid "Su_mmary:"
-msgstr "Ö_zet:"
-
-msgid "Su_n"
-msgstr "_Paz"
-
-msgid "Subject"
-msgstr "Konu"
-
-msgid "Subject contains"
-msgstr "Konu içerir"
-
-msgid "Subject does not contain"
-msgstr "Konu içermez"
-
-msgid "Subject is %s"
-msgstr "Konu: %s"
-
-msgid "Subject:"
-msgstr "Konu:"
-
-msgid "Submit Bug Report"
-msgstr "Hata Raporu Gönder"
-
-msgid "Submit _Bug Report"
-msgstr "_Hata Raporu Gönder"
-
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Bug Buddy kullanarak bir hata raporu gönderin"
-
-msgid "Subscribe"
-msgstr "Üye ol"
-
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Uzak sunuculardaki dizinlere üyelik işlemini gerçekleştir"
-
-msgid "Subscribing to folder \"%s\""
-msgstr "\"%s\" dizinine üye olunuyor"
-
-msgid "Success"
-msgstr "Başarıldı"
-
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-msgid "Sudan"
-msgstr "Sudan"
-
-msgid "Suggest automatic display of attachment"
-msgstr "Eklentinin otomatik gösterimini öner"
-
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-msgid "Summary"
-msgstr "Özet"
-
-msgid "Summary Settings"
-msgstr "Özet Ayarları"
-
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Özet ve dizin uyuşmazlığı"
-
-msgid "Summary contains"
-msgstr "Özet içeriği"
-
-msgid "Summary:"
-msgstr "Özet:"
-
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-msgid "Sunday"
-msgstr "Pazar"
-
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-msgid "Suriname"
-msgstr "Surinam"
-
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Svalbard And Jan Mayen Adaları"
-
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle "
 
-msgid "Swaziland"
-msgstr "Swaziland"
-
-msgid "Sweden"
-msgstr "İsveç"
-
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-msgid "Switzerland"
-msgstr "İsviçre"
-
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-msgid "Syncing folder"
-msgstr "Dizin eşzamanlı hale getiriliyor"
-
-msgid "Syncing folders"
-msgstr "Dizinler eşzamanlı hale getiriliyor"
-
-msgid "Syntax error in parameters or arguments"
-msgstr "Parametre ya da argümanlarda imla hatası"
-
-msgid "Syntax error, command unrecognized"
-msgstr "İmla hatası, bilinmeyen komut"
+#: my-evolution/Locations.h:2184
+#, fuzzy
+msgid "Sympheropol"
+msgstr "Stavropol"
 
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-msgid "System status, or system help reply"
-msgstr "Sistem durumu, ya da sistem yardım yanıtı"
-
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-msgid "TTY"
-msgstr "TTY"
-
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-msgid "T_hu"
-msgstr "P_er"
-
-msgid "T_ue"
-msgstr "_Sal"
-
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-msgid "Taiwan"
-msgstr "Tayvan"
-
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-msgid "Tajikistan"
-msgstr "Tacikistan"
-
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Airport"
 
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-msgid "Talinn"
-msgstr "Tallinn"
-
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Tallinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Airport"
 
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-msgid "Tas_ks due today:"
-msgstr "_Bugünün işleri:"
-
-msgid "Task"
-msgstr "Görev"
-
-msgid "Task - %s"
-msgstr "Görev - %s"
-
-msgid "Task Cancellation"
-msgstr "Görev İptali"
-
-msgid "Task Completed: <b>"
-msgstr "Tamamlanan Görev: <b>"
-
-msgid "Task Information"
-msgstr "Görev Bilgisi"
-
-msgid "Task Proposal"
-msgstr "Görev Taslağı"
-
-msgid "Task Reply"
-msgstr "Görev Yanıtı"
-
-msgid "Task Update"
-msgstr "Görev Güncellemesi"
-
-msgid "Task Update Request"
-msgstr "Güncel Görev Bilgisi İsteği"
-
-msgid "Task begins: <b>"
-msgstr "Görev başlangıcı: <b>"
-
-msgid "Task information"
-msgstr "Görev bilgisi"
-
-msgid "Task sort"
-msgstr "Görev sıralama"
-
-msgid "Tasks"
-msgstr "Görevler"
-
-msgid "Tasks "
-msgstr "Görevler "
-
-msgid "Tasks Settings..."
-msgstr "Görev Ayarları..."
-
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-msgid "Telex"
-msgstr "Teleks"
-
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Okunmuş iletileri geçici olarak gizle"
-
-msgid "Temporarily hide the selected messages"
-msgstr "Seçili iletileri geçici olarak gizle"
-
-msgid "Temporary authentication failure"
-msgstr "Geçici kimlik denetim hatası"
-
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-msgid "Tentative"
-msgstr "Girişimli"
-
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-msgid "Test"
-msgstr "Test"
-
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-msgid "Text Si_ze"
-msgstr "Metin _Boyu"
-
-msgid "Th"
-msgstr "Pe"
-
-msgid "Thailand"
-msgstr "Tayland"
-
-msgid "That person is already attending the meeting!"
-msgstr "Bu kişi toplantıya zaten katılıyor!"
-
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-msgid "The Evolution groupware suite"
-msgstr "Evolution kitlesel işlemler uygulaması"
-
-msgid "The Evolution shell."
-msgstr "Evolution kabuğu."
-
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Bu sistemde GNOME Pilot araçları kurulu değil."
-
-msgid "The Personal Addressbook Server"
-msgstr "Kişisel Adres Defteri Sunucusu"
-
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Kişisel Takvim Sunucusu"
-
-msgid "The URI of the tasks folder to display"
-msgstr "Gösterilecek görevler dizininin URI'si"
-
-msgid "The URI that the Folder Browser will display"
-msgstr "Dizin tarayıcısının göstereceği URI"
-
-msgid "The URI that the calendar will display"
-msgstr "Takvimin gösterecek olduğu URI"
-
-msgid "The attachment does not contain a valid calendar message"
-msgstr "Bu eklenti geçerli bir takvim mesajını içermiyor."
-
-msgid "The attachment has no viewable calendar items"
-msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
-
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Değiştirilen bağlantı adresinin adı ya da e-posta adresi zaten var.\n"
-"Yine de eklemek istiyor musunuz?"
-
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Gün, aşağıdaki biçimde girilmelidir: \n"
-"\n"
-"%s"
-
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"`%s' dizini var, ancak Evolution için \n"
-"kullanılmıyor. Lütfen Evolution kullanıcı dosyalarının\n"
-"kopyalanabilmesi için bu dizini taşıyınız."
-
-msgid "The encryption certificate for \"%s\" does not exist."
-msgstr "\"%s\" için şifreleme sertifikası bulunmuyor."
-
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"`%s' bir dizin değil.\n"
-"Evolution kullanıcı dosyalarının yüklenmesi\n"
-"bunu silmelisiniz."
-
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Dizin onarılamayacak şekilde bozulmuş."
-
-msgid "The folder is not empty"
-msgstr "Dizin boş değil"
-
-msgid "The following connections are currently active:"
-msgstr "Halen aşağıdaki bağlantılar etkin durumda:"
-
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Coğrafi konum aşağıdaki biçimde girilmelidir:\n"
-"\n"
-"45.436845,125.862501"
-
-msgid "The item could not be sent!\n"
-msgstr "Öğe gönderilemedi!\n"
-
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Toplantı bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
-
-msgid "The message contains only unsupported requests."
-msgstr "Bu iletide desteklenmeyen bilgiler var."
-
-msgid "The message does not appear to be properly formed"
-msgstr "Bu mesaj düzgün değil"
-
-msgid "The method required to load `%s' is not supported"
-msgstr "`%s' yüklemek için gereken yöntem desteklenmiyor"
-
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr "`%s' yüklemek için gereken yöntem desteklemiyor."
-
-msgid "The method required to open `%s' is not supported"
-msgstr "`%s' açmak için gereken yöntem desteklenmiyor"
-
-msgid ""
-"The name or email address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Bağlantı adresinin adı ya da e-posta adresi zaten var.\n"
-"Yine de eklemek istiyor musunuz?"
-
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Ana dizin üzerinde alt dizin açılamaz"
-
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Yüzde değeri 0 ile 100 arasında bulunmalıdır."
-
-msgid "The signature certificate for \"%s\" does not exist."
-msgstr "\"%s\" için imza sertifikası bulunmuyor."
-
-msgid "The specified folder cannot be modified or removed"
-msgstr "Belirtilen dizin düzenlenemedi ya da silinemedi"
-
-msgid "The specified folder name is not valid: %s"
-msgstr "Bu dizin adı geçersiz: %s"
-
-msgid "The specified folder type is not valid"
-msgstr "Belirtilen dizin türü geçerli değildir"
-
-msgid "The specified folder was not found"
-msgstr "Belirtilen dizin bulunamadı"
-
-msgid "The specified type is not supported in this storage"
-msgstr "Bu kayıtta belirtilen tip desteklenmiyor"
-
-msgid "The task information has changed. Send an updated version?"
-msgstr "Görev bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
-
-msgid "The time must be in the format: %s"
-msgstr "Gün %s biçiminde girilmelidir."
-
-msgid "Then"
-msgstr "Sonra"
-
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Bunu açabilecek hiç bir filtre bulunamadı:\n"
-"%s"
-
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-msgid "Thick mist"
-msgstr "Kalın sisli"
-
-msgid "Thick volcanic ash"
-msgstr "Kalın volkanik kül"
-
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Bu randevuyu Evolution düzenleyemiyor."
-
-msgid "This contact belongs to these categories:"
-msgstr "Bu bağlantı adı aşağıdaki sınıflandırmalara girer:"
-
-msgid "This event has been deleted."
-msgstr "Olay silindi."
-
-msgid "This folder cannot contain messages."
-msgstr "Bu dizinde ileti bulunamaz."
-
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "USENET haber gruplarından ileti okuma ve gönderme için sağlayıcı."
-
-msgid "This is the _mailing address"
-msgstr "_Bu mektuplaşma adresidir"
-
-msgid "This message contains invalid recipients:"
-msgstr "Bu ileti geçersiz alıcılar içeriyor:"
-
-msgid "This message contains only Bcc recipients."
-msgstr "Bu ileti sadece gizli (Bcc) alıcıları içeriyor."
-
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Bu iletinin konusu yok.\n"
-"Yine de gönderilsin mi?"
-
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Bu ileti gönderilmedi.\n"
-"Değişiklikleri kaydetmek istiyor musunuz?"
-
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Bu ileti dijital olarak imzalanmıştır ve güvenlidir."
-
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
-
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Bu ileti dijital olarak imzalanmıştır ve güvenlidir. Daha fazla bilgi için "
-"kilit simgesi üzerine tıklayın."
-
-msgid "This message is not currently available"
-msgstr "Bu ileti kullanılabilir değil"
-
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Evolution'un bu yeni sürümü kişisel Evolution dizinine ek dosya\n"
-"yerleştirilmesini gerektirir."
-
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Bu seçenek NNTP sunucusuna açık metin parola üzerinden kimlik denetimi "
-"yaptırır."
-
-msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr ""
-"Bu özellik, SMTP bağlantısı yaratmadan önce bir POP bağlantısı kuracaktır"
-
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Bu seçenek IMAP sunucusuna açık metin parola kullanarak bağlantı kurulmasını "
-"sağlar."
-
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Bu seçenek POP sunucuya açık metin parola kullanarak bağlantı kurar. Pek çok "
-"POP sunucusu tarafından desteklenir."
-
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Bu seçenek POP sunucuya şifreli APOP protokolünü kullanarak bağlantı kurar."
-
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Bu seçenek sunucuya Kerberos 4 kimlik denetimi ile bağlanacaktır."
-
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr "Bu seçenek sunucuya güvenli CRAM-MD5 sistemi ile bağlantı kuracaktır. "
-
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"Bu seçenek sunucuya güvenli DIGEST-MD5 sistemi ile bağlantı kuracaktır. "
-
-msgid "This option will connect to the server using a simple password."
-msgstr "Bu seçenek sunucuya basit bir parola kullanarak bağlantı kuracaktır."
-
-msgid "This option will connect to the server using an anonymous login."
-msgstr "Bu seçenek sunucuya anonim bağlantı kuracaktır."
-
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Bu ileti değiştirildi, ancak kaydedilmedi.\n"
-"\n"
-"Değişiklikleri kaydetmek istiyor musunuz?"
-
-msgid "This task has been changed."
-msgstr "Görev değiştirildi."
-
-msgid "This task has been deleted."
-msgstr "Bu görev silindi."
-
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Evolution'ın bu sürümünde LDAP desteği bulunmuyor. \n"
-"Eğer Evolution'ı LDAP desteği ile kullanmak istiyorsanız,\n"
-"programı CVS kaynaklarından alacağınız openLDAP desteği\n"
-"ile kurmalısınız:\n"
-
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-msgid "Threaded Message list"
-msgstr "Konumlandırılan İleti listesi"
-
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-msgid "Thursday"
-msgstr "Perşembe"
-
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-msgid "Time"
-msgstr "Zaman"
-
-msgid "Time Zones"
-msgstr "Zaman Dilimleri"
-
-msgid "Time _zone:"
-msgstr "Zaman _dilimi:"
-
-msgid "Time di_visions:"
-msgstr "_Zaman bölümleri:"
-
-msgid "Time format:"
-msgstr "Zaman biçimi:"
-
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"%s dosyasının kilidinin açılmasını beklerken zaman aşımı. Daha sonra yeniden "
-"deneyiniz."
-
-msgid "Timezone "
-msgstr "Zaman Dilimi "
-
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-msgid "Title"
-msgstr "Sıfat"
-
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-msgid "To"
-msgstr "Alıcı"
-
-msgid "To:"
-msgstr "Alıcı:"
-
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-msgid "Today"
-msgstr "Bugün"
-
-msgid "Today %l:%M %p"
-msgstr "Bugün %l:%M %p"
-
-msgid "Toggle"
-msgstr "Aç/kapat"
-
-msgid "Toggle whether to show the folder bar"
-msgstr "Dizin çubuğunu göster/gizle"
-
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Kısayol çubuğunu göster/gizle"
-
-msgid "Toggle whether we are working offline."
-msgstr "Çevrimiçi/çevrimdışı çalış."
-
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Bcc alanını gösterir/gizler"
-
-msgid "Toggles whether the CC field is displayed"
-msgstr "Cc alanını gösterir/gizler"
-
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Gönderen alanını gösterir/gizler"
-
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Yanıtla alanını gösterir/gizler"
-
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-msgid "Togo"
-msgstr "Togo"
-
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-msgid "Tokelau"
-msgstr "Tokelau"
-
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyo International Airport"
 
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo New International Airport"
 
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-msgid "Tonga"
-msgstr "Tonga"
-
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-msgid "Top:"
-msgstr "Tepe:"
-
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-msgid "Tornado"
-msgstr "Kasırga"
-
-msgid "Tornado in the vicinity"
-msgstr "Yer yer kasırga"
-
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-msgid "Toul-Rosieres"
-msgstr "Toul-Rosieres"
-
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
+#: my-evolution/Locations.h:2284
+msgid "Toul-Rosieres"
+msgstr "Toul-Rosieres"
+
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-msgid "Traditional"
-msgstr "Geleneksel"
-
-msgid "Transaction failed"
-msgstr "İletişim kurulamadı"
-
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-msgid "Trash"
-msgstr "Çöp"
-
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-msgid "Trinidad And Tobago"
-msgstr "Trinidad ve Tobago"
-
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima Airport"
 
-msgid "Tu"
-msgstr "Sa"
-
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-msgid "Tuesday"
-msgstr "Salı"
-
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-msgid "Tunisia"
-msgstr "Tunus"
-
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-msgid "Turkey"
-msgstr "Türkiye"
-
-msgid "Turkish"
-msgstr "Türkçe"
-
-msgid "Turkmenistan"
-msgstr "Türkmenistan"
-
-msgid "Turks And Caicos Islands"
-msgstr "Turks And Caicos Islands"
-
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-msgid "Type"
-msgstr "Tür"
-
-msgid "Type:"
-msgstr "Tip:"
-
-msgid "Type: %s"
-msgstr "Tür: %s"
-
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-msgid "U.S. Virgin Islands"
-msgstr "Virgin Islands, ABD"
-
-msgid "URL"
-msgstr "URL"
-
-msgid "URL '%s' needs a host component"
-msgstr "'%s' URL'inde makine adı bilgisi bulunmuyor"
-
-msgid "URL '%s' needs a path component"
-msgstr "'%s' URL'inde dizin bilgisi bulunmuyor"
-
-msgid "URL '%s' needs a username component"
-msgstr "'%s' URL'inde kullanıcı bilgisi bulunmuyor"
-
-msgid "URL:"
-msgstr "URL:"
-
-msgid "URL: %s"
-msgstr "URL: %s"
-
-msgid "US-Letter"
-msgstr "Zarf"
-
-msgid "USENET News via %s"
-msgstr "%s üzerinden USENET"
-
-msgid "USENET news"
-msgstr "USENET haber grubu"
-
-msgid "UTC"
-msgstr "UTC"
-
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-msgid "Uganda"
-msgstr "Uganda"
-
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-msgid "Ukraine"
-msgstr "Ukrayna"
-
-msgid "Ukrainian"
-msgstr "Ukraynaca"
-
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-msgid "Un-delete the selected messages"
-msgstr "Seçilen iletiyi silme"
-
-msgid "Unable to add message to summary: unknown reason"
-msgstr "İleti özete eklenemedi: bilinmeyen neden"
-
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"IMAP sunucuyla kimlik denetimi başarısız oldu\n"
-"%s\n"
-"\n"
-
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP sunucuyla kimlik denetimi başarısız oldu\n"
-"%s\n"
-"\n"
-
-msgid "Unable to connect to LDAP server."
-msgstr "LDAP sunucuyla bağlantı başarısız oldu"
-
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"POP sunucusuyla bağlantı kurulamadı.\n"
-"Parola iletiminde hata: %s"
-
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"POP sunucusuyla bağlantı kurulamadı.\n"
-"Parola iletiminde hata: %s"
-
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"POP sunucusuyla bağlantı kurulamadı.\n"
-"Belirtilen kimlik sınama protokolü desteklenmiyor."
-
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Çıkış dosyası yaratılamadı: %s\n"
-" %s"
-
-msgid "Unable to open addressbook"
-msgstr "Adres defterini açamadım"
-
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "%s için .newsrc dosyası oluşturulamadı: %s"
-
-msgid "Unable to open spool folder"
-msgstr "Spool dizini açılamadı"
-
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Bu hesap için taslak dizini açılamadı.\n"
-"Öntanımlı taslak dizinini kullanmak istiyor musunuz?"
-
-msgid "Unable to process spool folder"
-msgstr "Spool dizini işlenemedi"
-
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-msgid "Undefined"
-msgstr "Tanımsız"
-
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "IMAP sunucudan beklenmeyen cevap: %s"
-
-msgid "Unexpected response from IMAP server: %s"
-msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
-
-msgid "Unexpected response from POP server: %s"
-msgstr "POP sunucusundan beklenmeyen cevap: %s"
-
-msgid "Unicode"
-msgstr "Unicode"
-
-msgid "United Arab Emirates"
-msgstr "Birleşik Arap Emirlikleri"
-
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "United Arab Emirates "
 
-msgid "United Kingdom"
-msgstr "Birleşik Krallık"
-
-msgid "United Republic Of Tanzania"
-msgstr "Tanzanya"
-
-msgid "United States"
-msgstr "Amerika"
-
-msgid "United States Minor Outlying Islands"
-msgstr "United States Minor Outlying Islands"
-
-msgid "Unknown"
-msgstr "Bilinmiyor"
-
-msgid "Unknown Alarm Options"
-msgstr "Bilinmeyen Alarm Seçenekleri"
-
-msgid "Unknown action to be performed"
-msgstr "Bilinmeyen eylem"
-
-msgid "Unknown authentication state."
-msgstr "Bilinmeyen kimlik denetim konumu."
-
-msgid "Unknown character set: %s"
-msgstr "Bilinmeyen karakter seti: %s"
-
-msgid "Unknown error"
-msgstr "Bilinmeyen hata"
-
-msgid "Unknown error: %s"
-msgstr "Bilinmeyen hata: %s"
-
-msgid "Unmatched"
-msgstr "Eşleme yok"
-
-msgid "Unnamed Contact"
-msgstr "İsimsiz Bağlantı"
-
-msgid "Unnamed Contact List"
-msgstr "İsimsiz Bağlantı Listesi"
-
-msgid "Unseen"
-msgstr "Görünmeyen"
-
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-msgid "Unsubscribe"
-msgstr "Üyelikten çık"
-
-msgid "Unsubscribing to folder \"%s\""
-msgstr "\"%s\" dizininden üyelik siliniyor"
-
-msgid "Unsupported operation"
-msgstr "Desteklenmeyen işlem"
-
-msgid "Unsupported operation: append message: for %s"
-msgstr "Desteklenmeyen işlem: mesaja ekle: %s için"
-
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Desteklenmeyen işlem: ifade ile ara: %s için"
-
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Desteklenmeyen işlem: uid ile ara: %s için"
-
-msgid "Unsupported schema"
-msgstr "Desteklenmeyen şema"
-
-msgid "Unsupported type"
-msgstr "Desteklenmeyen tür"
-
-msgid "Untitled"
-msgstr "İsimsiz"
-
-msgid "Untitled Message"
-msgstr "Başlıksız İleti"
-
-msgid "Untitled appointment"
-msgstr "Başlıksız toplantı"
-
-msgid "Update"
-msgstr "Güncelle"
-
-msgid "Update complete\n"
-msgstr "Güncelleme tamamlandı\n"
-
-msgid "Update respondent status"
-msgstr "Cevaplayan Bilgisini Güncelle"
-
-msgid "Updated"
-msgstr "Güncellendi"
-
-msgid "Updating objects"
-msgstr "Nesneler güncelleniyor"
-
-msgid "Updating..."
-msgstr "Güncelleniyor..."
-
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-msgid "Url"
-msgstr "Url"
-
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-msgid "Uruguay"
-msgstr "Uruguay"
-
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-msgid "Use s_ecure connection (SSL)"
-msgstr "_Güvenli bağlantı (SSL) kullan"
-
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-" Use the right mouse button to zoom out."
-msgstr ""
-"Zaman dilimini seçebilmek için farenin sol tuşu ile haritaya yakınlaşın. \n"
-"Haritadan uzaklaşmak için farenin sağ tuşunu kullanın."
-
-msgid "User canceled operation."
-msgstr "Kullanıcı işlemi iptal etti."
-
-msgid "User not local; please try <forward-path>"
-msgstr "Kullanıcı yerel değil; lütfen <forward-path> deneyin"
-
-msgid "User not local; will forward to <forward-path>"
-msgstr "Kullanıcı yerel değil, <forward-path> üzerine yönlendirilecek"
-
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-msgid "Uzbekistan"
-msgstr "Özbekistan"
-
-msgid "VCard for %s"
-msgstr "%s için VCard"
-
-msgid "VFolder on Mailing List"
-msgstr "E-posta Listesi Üzerinde VFolder"
-
-msgid "VFolder on Mailing List (%s)"
-msgstr "E-posta Listesi Üzerinde VFolder (%s)"
-
-msgid "VFolder on Mailing _List"
-msgstr "_E-posta Listesi Üzerinde VFolder"
-
-msgid "VFolder on Mailing _List..."
-msgstr "_E-posta Listesine Göre VFolder..."
-
-msgid "VFolder on Se_nder"
-msgstr "_Gönderene Göre VFolder"
-
-msgid "VFolder on Se_nder..."
-msgstr "_Gönderene Göre VFolder..."
-
-msgid "VFolder on _Recipients"
-msgstr "_Alıcılara Göre VFolder"
-
-msgid "VFolder on _Recipients..."
-msgstr "_Alıcılara Göre VFolder..."
-
-msgid "VFolder on _Subject"
-msgstr "_Konuya Göre VFolder"
-
-msgid "VFolder on _Subject..."
-msgstr "_Konuya Göre VFolder..."
-
-msgid "VFolders"
-msgstr "VDizin"
+#: my-evolution/Locations.h:2352
+#, fuzzy
+msgid "Uzhgorod"
+msgstr "Avrupa/Uzhgorod"
 
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-msgid "Van Nuys"
-msgstr "Van Nuys"
-
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-msgid "Vanuatu"
-msgstr "Vanuatu"
+#: my-evolution/Locations.h:2371
+msgid "Van Nuys"
+msgstr "Van Nuys"
 
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-msgid "Variable"
-msgstr "Değişken"
-
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-msgid "Venezuela"
-msgstr "Venezuela"
-
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-msgid "Verifying is not supported by this cipher"
-msgstr "Bu şifreleme ile onaylama desteklenmiyor"
-
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-msgid "Viet Nam"
-msgstr "Vietnam"
-
-msgid "View Inline"
-msgstr "İzle"
-
-msgid "View Inline (via %s)"
-msgstr "İzle (%s kullanarak)"
-
-msgid "View the selected folder"
-msgstr "Seçili dizini göster"
-
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-msgid "Villa Reynolds"
-msgstr "Villa Reynolds"
-
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
+#: my-evolution/Locations.h:2397
+msgid "Villa Reynolds"
+msgstr "Villa Reynolds"
+
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-msgid "Virtual Folder _Editor..."
-msgstr "Sanal Dizin _Düzenleyici..."
-
-msgid "Virtual Folders"
-msgstr "Sanal Dizinler"
-
-msgid "Virtual Trash"
-msgstr "Sanal Çöp"
-
-msgid "Virtual Trash folder"
-msgstr "Sanal Çöp dizini"
-
-msgid "Virtual folder email provider"
-msgstr "Sanal dizin e-posta sağlayıcısı"
-
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-msgid "Volcanic ash"
-msgstr "Volkanik kül"
-
-msgid "Volcanic ash in the vicinity"
-msgstr "Yer yer volkanik kül"
-
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-msgid "Volk Field"
-msgstr "Volk Field"
-
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
+#: my-evolution/Locations.h:2413
+msgid "Volk Field"
+msgstr "Volk Field"
+
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-msgid "W"
-msgstr "B"
-
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-msgid "Waiting for connection to LDAP server..."
-msgstr "LDAP sunucuyla bağlantı bekleniyor..."
-
-msgid "Waiting..."
-msgstr "Bekleniyor..."
-
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-msgid "Wallis And Futuna Islands"
-msgstr "Wallis And Futuna Islands"
-
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-msgid "Wants to receive _HTML mail"
-msgstr "_HTML e-postalarını kabul ediyor"
-
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-msgid "Warning"
-msgstr "Uyarı"
-
-msgid "Warning!"
-msgstr "Uyarı!"
-
-msgid "Warning: Modified Message"
-msgstr "Uyarı: İleti Değiştirildi"
-
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-msgid "We"
-msgstr "Ça"
-
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-"Bu adres defteri açılamadı. Yeterli izin haklarına sahip olup\n"
-"olmadığınızı ve dosyanın yerini kontrol edin."
-
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
-msgstr ""
-"Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
-"ya da LDAP sunucusu erişilemiyor olabilir."
-
-msgid "Weather"
-msgstr "Hava Durumu"
-
-msgid "Weather settings"
-msgstr "Hava durumu ayarları"
-
-msgid "Web Site"
-msgstr "Web Sayfası"
-
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-msgid "Wednesday"
-msgstr "Çarşamba"
-
-msgid "Week"
-msgstr "Hafta"
-
-msgid "Week View"
-msgstr "Hafta Görünümü"
-
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-msgid "Welcome"
-msgstr "Hoşgeldiniz"
-
-msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
-"\n"
-"Please click the \"Next\" button to continue. "
-msgstr ""
-"Evolution'a hoşgeldiniz. Biraz sonra göreceğiniz bir kaç ekran,\n"
-"Evolution'un e-posta hesaplarınıza erişmesi ve diğer uygulamalardan\n"
-"aktarma yapması için gereken bilgileri alacaktır.\n"
-"\n"
-"Lütfen devam etmek için \"İleri\" düğmesine tıklayın. "
-
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Evolution dosya aktarma yardımcı programına hoşgeldiniz\n"
-"Bu sihirbaz ile harici dosyaları Evolution'a dahil edebileceksiniz."
-
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Evolution E-posta Yapılandırma Sihirbazına Hoşgeldiniz.\n"
-"\n"
-"Devam etmek için \"İleri\" düğmesine tıklayın."
-
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-msgid "West"
-msgstr "Batı"
-
-msgid "West - Northwest"
-msgstr "Batı - Kuzeybatı"
-
-msgid "West - Southwest"
-msgstr "Batı - Güneybatı"
-
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
+#: my-evolution/Locations.h:2444
+msgid "Westerland"
+msgstr "Westerland"
+
+#: my-evolution/Locations.h:2445
+msgid "Westfield"
+msgstr "Westfield"
+
+#: my-evolution/Locations.h:2446
+msgid "Westhampton"
+msgstr "Westhampton"
+
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-msgid "Westerland"
-msgstr "Westerland"
-
-msgid "Western European"
-msgstr "Batı Avrupa"
-
-msgid "Western Sahara"
-msgstr "Western Sahara"
-
-msgid "Westfield"
-msgstr "Westfield"
-
-msgid "Westhampton"
-msgstr "Westhampton"
-
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
+#: my-evolution/Locations.h:2453
+msgid "Whitefield"
+msgstr "Whitefield"
+
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-msgid "Whitefield"
-msgstr "Whitefield"
-
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-msgid "Width:"
-msgstr "Genişlik:"
-
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-msgid "With Category"
-msgstr "Kategori ile"
-
-msgid "With these arguments:"
-msgstr "Bu argümanlarla:"
-
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-msgid "Work Offline"
-msgstr "Çevrimdışı Çalış"
-
-msgid "Work Week"
-msgstr "Çalışma Haftası"
-
-msgid "Work Week View"
-msgstr "Çalışma Haftası Görünümü"
-
-msgid "Working"
-msgstr "Çalışıyor"
-
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Geçici dosya kutusuna yazma işlemi başarısız: %s: %s"
-
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-msgid "Ximian Evolution"
-msgstr "Ximian Evolution"
-
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _SSS"
-
-msgid ""
-"Ximian Evolution has found unsaved files from a previous session.\n"
-"Would you like to try to recover them?"
-msgstr ""
-"Evolution, önceki oturumlardan kaydedilmemiş dosyalar saptadı.\n"
-"Bunları kurtarmak istiyor musunuz?"
-
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution çevrimdışı çalışıyor. Bu düğmeye tıklayarak çevrimiçi "
-"çalışmasını sağlayın."
-
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution çevrimiçi çlışıyor. Bu düğmeye tıklayarak çevrimdışı "
-"çalışmasını sağlayın."
-
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution çevrimdışı çalışmak üzere hazırlanıyor."
-
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata Airport"
 
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Airport"
 
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao Airport"
 
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-msgid "Yemen"
-msgstr "Yemen"
-
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-msgid "Yes"
-msgstr "Evet"
-
-msgid "Yesterday %l:%M %p"
-msgstr "Dün %l:%M %p"
-
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
+#: my-evolution/Locations.h:2520
+msgid "Youngstown"
+msgstr "Youngstown"
+
+#: my-evolution/Locations.h:2521
+msgid "Ypsilanti"
+msgstr "Ypsilanti"
+
+#: my-evolution/Locations.h:2523
+msgid "Yukon"
+msgstr "Yukon"
+
+#: my-evolution/Locations.h:2524
+msgid "Yuma MCAS"
+msgstr "Yuma MCAS"
+
+#: my-evolution/Locations.h:2525
+msgid "Yurimaguas"
+msgstr "Yurimaguas"
+
+#: my-evolution/Locations.h:2526
+msgid "Yuzhno-Sakhalinsk"
+msgstr "Yuzhno-Sakhalinsk"
+
+#: my-evolution/Locations.h:2527
+msgid "Zacatecas"
+msgstr "Zacatecas"
+
+#: my-evolution/Locations.h:2528
+msgid "Zadar"
+msgstr "Zadar"
+
+#: my-evolution/Locations.h:2529
+msgid "Zagreb"
+msgstr "Zagreb"
+
+#: my-evolution/Locations.h:2530
+msgid "Zakinthos"
+msgstr "Zakinthos"
+
+#: my-evolution/Locations.h:2531
+msgid "Zama Airfield"
+msgstr "Zama Airfield"
+
+#: my-evolution/Locations.h:2532
+msgid "Zanesville"
+msgstr "Zanesville"
+
+#: my-evolution/Locations.h:2533
+msgid "Zaragoza"
+msgstr "Zaragoza"
+
+#: my-evolution/Locations.h:2534
+msgid "Zell Am See"
+msgstr "Zell Am See"
+
+#: my-evolution/Locations.h:2535
+msgid "Zuni Pueblo"
+msgstr "Zuni Pueblo"
+
+#: my-evolution/Locations.h:2536
+msgid "Zurich"
+msgstr "Zürih"
+
+#: my-evolution/component-factory.c:51
+msgid "Folder containing the Evolution Summary"
+msgstr "Evolution Özeti içeren dizin"
+
+#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+msgid "Appointments"
+msgstr "Randevular"
+
+#: my-evolution/e-summary-calendar.c:368
+msgid "No appointments"
+msgstr "Randevu yok"
+
+#: my-evolution/e-summary-calendar.c:404
+#, fuzzy
+msgid "%k:%M %d %B"
+msgstr "%d %B %A"
+
+#: my-evolution/e-summary-calendar.c:406
+#, fuzzy
+msgid "%l:%M %d %B"
+msgstr "%d %B %A"
+
+#: my-evolution/e-summary-calendar.c:424
+msgid "No description"
+msgstr "Açıklama yok"
+
+#: my-evolution/e-summary-mail.c:154
+msgid "Mail summary"
+msgstr "İleti özeti"
+
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
+msgid "Local Folders"
+msgstr "Yerel Dizinler"
+
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
+#. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
+#: my-evolution/e-summary-preferences.c:108
+#: my-evolution/e-summary-weather.c:591
+msgid "KBOS"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:584
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:602
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr "Yeni bir haber grubu ekle"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr "Eklenecek haber grubunun adını buraya yazın"
+
+#: my-evolution/e-summary-rdf.c:304
+msgid "Error downloading RDF"
+msgstr "RDF indirirken bir hata oluştu"
+
+#: my-evolution/e-summary-rdf.c:448
+msgid "News Feed"
+msgstr "Haber Grubu"
+
+#: my-evolution/e-summary-shown.c:541
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:553
+#, fuzzy
+msgid "Add"
+msgstr "_Ekle"
+
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Karlı"
+
+#: my-evolution/e-summary-tasks.c:312
+msgid "No tasks"
+msgstr "Görev yok"
+
+#: my-evolution/e-summary-tasks.c:357
+msgid "(No Description)"
+msgstr "(Açıklama Yok)"
+
+#: my-evolution/e-summary-weather.c:71
+msgid "My Weather"
+msgstr "Hava Durumu"
+
+#: my-evolution/e-summary-weather.c:267
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:489
+msgid "Weather"
+msgstr "Hava Durumu"
+
+#: my-evolution/e-summary.c:193
+msgid "%A, %B %e %Y"
+msgstr "%e %B %A, %Y"
+
+#: my-evolution/e-summary.c:488
+msgid "Please wait..."
+msgstr "Lütfen bekleyiniz..."
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Yazdırma Özeti"
+
+#: my-evolution/e-summary.c:626
+msgid "Printing of Summary failed"
+msgstr "Özetin yazdırılmasında hata"
+
+#: my-evolution/main.c:64
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Bonobo başlatılamadı.\n"
+
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "knot"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "km/h"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "mil"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometre"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
+msgstr "Açık gökyüzü"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr "Parçalı bulutlu"
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr "Dağınık bulutlu"
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr "Az bulutlu"
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+msgid "Invalid"
+msgstr "Geçersiz"
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr "Değişken"
+
+#: my-evolution/metar.c:64
+msgid "North"
+msgstr "Kuzey"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr "Kuzey - Kuzeydoğu"
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr "Kuzeydoğu"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr "Doğu - Kuzeydoğu"
+
+#: my-evolution/metar.c:65
+msgid "East"
+msgstr "Doğu"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr "Doğu - Güneydoğu"
+
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr "Güneydoğu"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr "Güney - Güneydoğu"
+
+#: my-evolution/metar.c:66
+msgid "South"
+msgstr "Güney"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr "Güney - Güneybatı"
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr "Güneybatı"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr "Batı - Güneybatı"
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr "Batı"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr "Batı - Kuzeybatı"
+
+#: my-evolution/metar.c:67
+msgid "Northwest"
+msgstr "Kuzeybatı"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr "Kuzey - Kuzeybatı"
+
+#. DRIZZLE
+#: my-evolution/metar.c:127
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:128
+#, fuzzy
+msgid "Drizzle in the vicinity"
+msgstr "Yer yer yağmurlu"
+
+#: my-evolution/metar.c:129
+#, fuzzy
+msgid "Light drizzle"
+msgstr "Hafif yağmurlu"
+
+#: my-evolution/metar.c:130
+#, fuzzy
+msgid "Moderate drizzle"
+msgstr "Orta yağmur"
+
+#: my-evolution/metar.c:131
+#, fuzzy
+msgid "Heavy drizzle"
+msgstr "Ağır yağmur"
+
+#: my-evolution/metar.c:132
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:133
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:134
+#, fuzzy
+msgid "Partial drizzle"
+msgstr "Kısmi yağmurlu"
+
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#, fuzzy
+msgid "Thunderstorm"
+msgstr "Anderson"
+
+#: my-evolution/metar.c:136
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:137
+#, fuzzy
+msgid "Showers"
+msgstr "saat"
+
+#: my-evolution/metar.c:138
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:139
+#, fuzzy
+msgid "Freezing drizzle"
+msgstr "Dondurucu yağmur"
+
+#. RAIN
+#: my-evolution/metar.c:142
+msgid "Rain"
+msgstr "Yağmurlu"
+
+#: my-evolution/metar.c:143
+msgid "Rain in the vicinity"
+msgstr "Yer yer yağmurlu"
+
+#: my-evolution/metar.c:144
+msgid "Light rain"
+msgstr "Hafif yağmurlu"
+
+#: my-evolution/metar.c:145
+msgid "Moderate rain"
+msgstr "Orta yağmur"
+
+#: my-evolution/metar.c:146
+msgid "Heavy rain"
+msgstr "Ağır yağmur"
+
+#: my-evolution/metar.c:147
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:148
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:149
+msgid "Partial rainfall"
+msgstr "Kısmi yağmurlu"
+
+#: my-evolution/metar.c:151
+#, fuzzy
+msgid "Blowing rainfall"
+msgstr "Kısmi yağmurlu"
+
+#: my-evolution/metar.c:152
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:153
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Dondurucu yağmur"
+
+#: my-evolution/metar.c:154
+msgid "Freezing rain"
+msgstr "Dondurucu yağmur"
+
+#. SNOW
+#: my-evolution/metar.c:157
+msgid "Snow"
+msgstr "Karlı"
+
+#: my-evolution/metar.c:158
+msgid "Snow in the vicinity"
+msgstr "Yer yer kar yağışı"
+
+#: my-evolution/metar.c:159
+msgid "Light snow"
+msgstr "Hafif kar yağışı"
+
+#: my-evolution/metar.c:160
+msgid "Moderate snow"
+msgstr "Orta şiddette kar yağışı"
+
+#: my-evolution/metar.c:161
+msgid "Heavy snow"
+msgstr "Ağır kar yağışı"
+
+#: my-evolution/metar.c:162
+#, fuzzy
+msgid "Shallow snow"
+msgstr "Show Low"
+
+#: my-evolution/metar.c:163
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:164
+#, fuzzy
+msgid "Partial snowfall"
+msgstr "Kısmi yağmurlu"
+
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
+msgid "Snowstorm"
+msgstr "Kar fırtınası"
+
+#: my-evolution/metar.c:166
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:167
+#, fuzzy
+msgid "Snow showers"
+msgstr "Kar fırtınası"
+
+#: my-evolution/metar.c:168
+#, fuzzy
+msgid "Drifting snow"
+msgstr "Dondurucu kar"
+
+#: my-evolution/metar.c:169
+msgid "Freezing snow"
+msgstr "Dondurucu kar"
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:172
+#, fuzzy
+msgid "Snow grains"
+msgstr "Ayrıntıları Göster"
+
+#: my-evolution/metar.c:173
+#, fuzzy
+msgid "Snow grains in the vicinity"
+msgstr "Yer yer kar yağışı"
+
+#: my-evolution/metar.c:174
+#, fuzzy
+msgid "Light snow grains"
+msgstr "Hafif kar yağışı"
+
+#: my-evolution/metar.c:175
+#, fuzzy
+msgid "Moderate snow grains"
+msgstr "Orta şiddette kar yağışı"
+
+#: my-evolution/metar.c:176
+#, fuzzy
+msgid "Heavy snow grains"
+msgstr "Ağır kar yağışı"
+
+#: my-evolution/metar.c:177
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:178
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:179
+#, fuzzy
+msgid "Partial snow grains"
+msgstr "Kısmi yağmurlu"
+
+#: my-evolution/metar.c:181
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:182
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:183
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Açıklama içeriği"
+
+#: my-evolution/metar.c:184
+#, fuzzy
+msgid "Freezing snow grains"
+msgstr "Dondurucu kar"
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:187
+msgid "Ice crystals"
+msgstr "Buzlanma"
+
+#: my-evolution/metar.c:188
+msgid "Ice crystals in the vicinity"
+msgstr "Yer yer buzlanma"
+
+#: my-evolution/metar.c:189
+msgid "Few ice crystals"
+msgstr "Az derecede buzlanma"
+
+#: my-evolution/metar.c:190
+msgid "Moderate ice crystals"
+msgstr "Orta derecede buzlanma"
+
+#: my-evolution/metar.c:191
+#, fuzzy
+msgid "Heavy ice crystals"
+msgstr "Az derecede buzlanma"
+
+#: my-evolution/metar.c:193
+#, fuzzy
+msgid "Patches of ice crystals"
+msgstr "Orta derecede buzlanma"
+
+#: my-evolution/metar.c:194
+#, fuzzy
+msgid "Partial ice crystals"
+msgstr "Orta derecede buzlanma"
+
+#: my-evolution/metar.c:195
+msgid "Ice crystal storm"
+msgstr "Buz fırtınası"
+
+#: my-evolution/metar.c:196
+#, fuzzy
+msgid "Blowing ice crystals"
+msgstr "Az derecede buzlanma"
+
+#: my-evolution/metar.c:197
+#, fuzzy
+msgid "Showers of ice crystals"
+msgstr "Orta derecede buzlanma"
+
+#: my-evolution/metar.c:198
+#, fuzzy
+msgid "Drifting ice crystals"
+msgstr "Orta derecede buzlanma"
+
+#: my-evolution/metar.c:199
+#, fuzzy
+msgid "Freezing ice crystals"
+msgstr "Az derecede buzlanma"
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:202
+msgid "Ice pellets"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:203
+#, fuzzy
+msgid "Ice pellets in the vicinity"
+msgstr "Yer yer buzlanma"
+
+#: my-evolution/metar.c:204
+#, fuzzy
+msgid "Few ice pellets"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:205
+#, fuzzy
+msgid "Moderate ice pellets"
+msgstr "Orta derecede buzlanma"
+
+#: my-evolution/metar.c:206
+#, fuzzy
+msgid "Heavy ice pellets"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:207
+#, fuzzy
+msgid "Shallow ice pellets"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:208
+#, fuzzy
+msgid "Patches of ice pellets"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:209
+#, fuzzy
+msgid "Partial ice pellets"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:210
+#, fuzzy
+msgid "Ice pellet storm"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:211
+#, fuzzy
+msgid "Blowing ice pellets"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:212
+#, fuzzy
+msgid "Showers of ice pellets"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:213
+#, fuzzy
+msgid "Drifting ice pellets"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:214
+#, fuzzy
+msgid "Freezing ice pellets"
+msgstr "Buz peltesi"
+
+#: my-evolution/metar.c:218
+#, fuzzy
+msgid "Hail in the vicinity"
+msgstr "Yer yer yağmurlu"
+
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#, fuzzy
+msgid "Light hail"
+msgstr "Hafif yağmurlu"
+
+#: my-evolution/metar.c:220
+#, fuzzy
+msgid "Moderate hail"
+msgstr "Orta yağmur"
+
+#: my-evolution/metar.c:221
+#, fuzzy
+msgid "Heavy hail"
+msgstr "Ağır yağmur"
+
+#: my-evolution/metar.c:222
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Ayrıntıları Göster"
+
+#: my-evolution/metar.c:223
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:224
+#, fuzzy
+msgid "Partial hail"
+msgstr "Kısmi yağmurlu"
+
+#: my-evolution/metar.c:225
+#, fuzzy
+msgid "Hailstorm"
+msgstr "Hamilton"
+
+#: my-evolution/metar.c:226
+#, fuzzy
+msgid "Blowing hail"
+msgstr "Bellingham"
+
+#: my-evolution/metar.c:227
+#, fuzzy
+msgid "Hail showers"
+msgstr "Alt dizinler"
+
+#: my-evolution/metar.c:228
+#, fuzzy
+msgid "Drifting hail"
+msgstr "İleti Alınıyor"
+
+#: my-evolution/metar.c:229
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Dondurucu yağmur"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:232
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:233
+#, fuzzy
+msgid "Small hail in the vicinity"
+msgstr "Yer yer yağmurlu"
+
+#: my-evolution/metar.c:235
+#, fuzzy
+msgid "Moderate small hail"
+msgstr "Orta derecede sisli"
+
+#: my-evolution/metar.c:236
+#, fuzzy
+msgid "Heavy small hail"
+msgstr "Ağır yağmur"
+
+#: my-evolution/metar.c:237
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Tüm _görevleri göster"
+
+#: my-evolution/metar.c:238
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:239
+#, fuzzy
+msgid "Partial small hail"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:240
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:241
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:242
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:243
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:244
+#, fuzzy
+msgid "Freezing small hail"
+msgstr "Dondurucu yağmur"
+
+#. PRECIPITATION
+#: my-evolution/metar.c:247
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Bilinmeyen Alarm Seçenekleri"
+
+#: my-evolution/metar.c:248
+#, fuzzy
+msgid "Precipitation in the vicinity"
+msgstr "Yer yer yağmurlu"
+
+#: my-evolution/metar.c:249
+#, fuzzy
+msgid "Light precipitation"
+msgstr "Hafif yağmurlu"
+
+#: my-evolution/metar.c:250
+#, fuzzy
+msgid "Moderate precipitation"
+msgstr "Orta yağmur"
+
+#: my-evolution/metar.c:251
+#, fuzzy
+msgid "Heavy precipitation"
+msgstr "Ağır yağmur"
+
+#: my-evolution/metar.c:252
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:253
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:254
+#, fuzzy
+msgid "Partial precipitation"
+msgstr "Kısmi yağmurlu"
+
+#: my-evolution/metar.c:255
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Bilinmeyen hata"
+
+#: my-evolution/metar.c:256
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:257
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:258
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:259
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Dondurucu yağmur"
+
+#. MIST
+#: my-evolution/metar.c:262
+msgid "Mist"
+msgstr "Sisli"
+
+#: my-evolution/metar.c:263
+msgid "Mist in the vicinity"
+msgstr "Yer yer sisli"
+
+#: my-evolution/metar.c:264
+msgid "Light mist"
+msgstr "Hafif sisli"
+
+#: my-evolution/metar.c:265
+msgid "Moderate mist"
+msgstr "Orta derecede sisli"
+
+#: my-evolution/metar.c:266
+msgid "Thick mist"
+msgstr "Kalın sisli"
+
+#: my-evolution/metar.c:267
+#, fuzzy
+msgid "Shallow mist"
+msgstr "Challis"
+
+#: my-evolution/metar.c:268
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:269
+msgid "Partial mist"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:271
+#, fuzzy
+msgid "Mist with wind"
+msgstr "Yer yer sisli"
+
+#: my-evolution/metar.c:273
+#, fuzzy
+msgid "Drifting mist"
+msgstr "E-posta listesi"
+
+#: my-evolution/metar.c:274
+#, fuzzy
+msgid "Freezing mist"
+msgstr "Dondurucu yağmur"
+
+#. FOG
+#: my-evolution/metar.c:277
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:278
+#, fuzzy
+msgid "Fog in the vicinity"
+msgstr "Yer yer kar yağışı"
+
+#: my-evolution/metar.c:279
+#, fuzzy
+msgid "Light fog"
+msgstr "Hafif kar yağışı"
+
+#: my-evolution/metar.c:280
+#, fuzzy
+msgid "Moderate fog"
+msgstr "Orta şiddette kar yağışı"
+
+#: my-evolution/metar.c:281
+#, fuzzy
+msgid "Thick fog"
+msgstr "Kalın sisli"
+
+#: my-evolution/metar.c:282
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Show Low"
+
+#: my-evolution/metar.c:283
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:284
+#, fuzzy
+msgid "Partial fog"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:286
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Bu pencereyi kapat"
+
+#: my-evolution/metar.c:288
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:289
+#, fuzzy
+msgid "Freezing fog"
+msgstr "Dondurucu kar"
+
+#. SMOKE
+#: my-evolution/metar.c:292
+#, fuzzy
+msgid "Smoke"
+msgstr "Spokane"
+
+#: my-evolution/metar.c:293
+#, fuzzy
+msgid "Smoke in the vicinity"
+msgstr "Yer yer kar yağışı"
+
+#: my-evolution/metar.c:294
+#, fuzzy
+msgid "Thin smoke"
+msgstr "China Lake"
+
+#: my-evolution/metar.c:295
+#, fuzzy
+msgid "Moderate smoke"
+msgstr "Orta şiddette kar yağışı"
+
+#: my-evolution/metar.c:296
+#, fuzzy
+msgid "Thick smoke"
+msgstr "Kalın sisli"
+
+#: my-evolution/metar.c:297
+msgid "Shallow smoke"
+msgstr ""
+
+#: my-evolution/metar.c:298
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:299
+#, fuzzy
+msgid "Partial smoke"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
+msgstr ""
+
+#: my-evolution/metar.c:301
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Bu pencereyi kapat"
+
+#: my-evolution/metar.c:303
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:307
+msgid "Volcanic ash"
+msgstr "Volkanik kül"
+
+#: my-evolution/metar.c:308
+msgid "Volcanic ash in the vicinity"
+msgstr "Yer yer volkanik kül"
+
+#: my-evolution/metar.c:310
+msgid "Moderate volcanic ash"
+msgstr "Orta derecede volkanik kül"
+
+#: my-evolution/metar.c:311
+msgid "Thick volcanic ash"
+msgstr "Kalın volkanik kül"
+
+#: my-evolution/metar.c:312
+#, fuzzy
+msgid "Shallow volcanic ash"
+msgstr "Kısmi volkanik kül"
+
+#: my-evolution/metar.c:313
+#, fuzzy
+msgid "Patches of volcanic ash"
+msgstr "Kısmi volkanik kül"
+
+#: my-evolution/metar.c:314
+msgid "Partial volcanic ash"
+msgstr "Kısmi volkanik kül"
+
+#: my-evolution/metar.c:315
+#, fuzzy
+msgid "Thunderous volcanic ash"
+msgstr "Kalın volkanik kül"
+
+#: my-evolution/metar.c:316
+#, fuzzy
+msgid "Blowing volcanic ash"
+msgstr "Kalın volkanik kül"
+
+#: my-evolution/metar.c:317
+#, fuzzy
+msgid "Showers of volcanic ash"
+msgstr "Orta derecede volkanik kül"
+
+#: my-evolution/metar.c:318
+#, fuzzy
+msgid "Drifting volcanic ash"
+msgstr "Kısmi volkanik kül"
+
+#: my-evolution/metar.c:319
+#, fuzzy
+msgid "Freezing volcanic ash"
+msgstr "Kısmi volkanik kül"
+
+#. SAND
+#: my-evolution/metar.c:322
+msgid "Sand"
+msgstr "Kumlu"
+
+#: my-evolution/metar.c:323
+#, fuzzy
+msgid "Sand in the vicinity"
+msgstr "Yer yer yağmurlu"
+
+#: my-evolution/metar.c:324
+#, fuzzy
+msgid "Light sand"
+msgstr "Hafif yağmurlu"
+
+#: my-evolution/metar.c:325
+#, fuzzy
+msgid "Moderate sand"
+msgstr "Orta şiddette kar yağışı"
+
+#: my-evolution/metar.c:326
+#, fuzzy
+msgid "Heavy sand"
+msgstr "Ağır yağmur"
+
+#: my-evolution/metar.c:328
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:329
+#, fuzzy
+msgid "Partial sand"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:331
+#, fuzzy
+msgid "Blowing sand"
+msgstr "Block Island"
+
+#: my-evolution/metar.c:333
+#, fuzzy
+msgid "Drifting sand"
+msgstr "Barking Sand"
+
+#. HAZE
+#: my-evolution/metar.c:337
+#, fuzzy
+msgid "Haze"
+msgstr "Havre"
+
+#: my-evolution/metar.c:338
+#, fuzzy
+msgid "Haze in the vicinity"
+msgstr "Yer yer yağmurlu"
+
+#: my-evolution/metar.c:339
+#, fuzzy
+msgid "Light haze"
+msgstr "Hafif yağmurlu"
+
+#: my-evolution/metar.c:340
+#, fuzzy
+msgid "Moderate haze"
+msgstr "Orta yağmur"
+
+#: my-evolution/metar.c:341
+#, fuzzy
+msgid "Thick haze"
+msgstr "Kalın sisli"
+
+#: my-evolution/metar.c:342
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:343
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:344
+#, fuzzy
+msgid "Partial haze"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:346
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:348
+#, fuzzy
+msgid "Drifting haze"
+msgstr "Dillingham"
+
+#: my-evolution/metar.c:349
+#, fuzzy
+msgid "Freezing haze"
+msgstr "Dondurucu yağmur"
+
+#. SPRAY
+#: my-evolution/metar.c:352
+#, fuzzy
+msgid "Spray"
+msgstr "Cumartesi"
+
+#: my-evolution/metar.c:353
+#, fuzzy
+msgid "Spray in the vicinity"
+msgstr "Yer yer kar yağışı"
+
+#: my-evolution/metar.c:354
+#, fuzzy
+msgid "Light spray"
+msgstr "Hafif yağmurlu"
+
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "Orta yağmur"
+
+#: my-evolution/metar.c:356
+#, fuzzy
+msgid "Heavy spray"
+msgstr "Ağır yağmur"
+
+#: my-evolution/metar.c:357
+msgid "Shallow spray"
+msgstr ""
+
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
+msgstr ""
+
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:361
+#, fuzzy
+msgid "Blowing spray"
+msgstr "Bowling Green"
+
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
+msgstr ""
+
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
+msgstr "Dondurucu yağmur"
+
+#. DUST
+#: my-evolution/metar.c:367
+msgid "Dust"
+msgstr "Toz"
+
+#: my-evolution/metar.c:368
+#, fuzzy
+msgid "Dust in the vicinity"
+msgstr "Yer yer sisli"
+
+#: my-evolution/metar.c:369
+#, fuzzy
+msgid "Light dust"
+msgstr "Hafif sisli"
+
+#: my-evolution/metar.c:370
+#, fuzzy
+msgid "Moderate dust"
+msgstr "Orta derecede sisli"
+
+#: my-evolution/metar.c:371
+#, fuzzy
+msgid "Heavy dust"
+msgstr "Ağır kar yağışı"
+
+#: my-evolution/metar.c:373
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:374
+#, fuzzy
+msgid "Partial dust"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:376
+#, fuzzy
+msgid "Blowing dust"
+msgstr "Bloomington"
+
+#: my-evolution/metar.c:378
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:382
+#, fuzzy
+msgid "Squall"
+msgstr "Aquadilla"
+
+#: my-evolution/metar.c:383
+#, fuzzy
+msgid "Squall in the vicinity"
+msgstr "Yer yer yağmurlu"
+
+#: my-evolution/metar.c:384
+#, fuzzy
+msgid "Light squall"
+msgstr "Hafif kar yağışı"
+
+#: my-evolution/metar.c:385
+#, fuzzy
+msgid "Moderate squall"
+msgstr "Orta derecede sisli"
+
+#: my-evolution/metar.c:386
+#, fuzzy
+msgid "Heavy squall"
+msgstr "Ağır kar yağışı"
+
+#: my-evolution/metar.c:389
+#, fuzzy
+msgid "Partial squall"
+msgstr "Kısmi yağmurlu"
+
+#: my-evolution/metar.c:390
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:391
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:393
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:394
+#, fuzzy
+msgid "Freezing squall"
+msgstr "Dondurucu yağmur"
+
+#. SANDSTORM
+#: my-evolution/metar.c:397
+#, fuzzy
+msgid "Sandstorm"
+msgstr "Kar fırtınası"
+
+#: my-evolution/metar.c:398
+#, fuzzy
+msgid "Sandstorm in the vicinity"
+msgstr "Yer yer kar yağışı"
+
+#: my-evolution/metar.c:399
+#, fuzzy
+msgid "Light standstorm"
+msgstr "Dondurucu toz fırtınası"
+
+#: my-evolution/metar.c:400
+#, fuzzy
+msgid "Moderate sandstorm"
+msgstr "Orta şiddette kar yağışı"
+
+#: my-evolution/metar.c:401
+#, fuzzy
+msgid "Heavy sandstorm"
+msgstr "Ağır kar yağışı"
+
+#: my-evolution/metar.c:402
+#, fuzzy
+msgid "Shallow sandstorm"
+msgstr "Kar fırtınası"
+
+#: my-evolution/metar.c:404
+#, fuzzy
+msgid "Partial sandstorm"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:405
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:406
+#, fuzzy
+msgid "Blowing sandstorm"
+msgstr "Dondurucu toz fırtınası"
+
+#: my-evolution/metar.c:408
+#, fuzzy
+msgid "Drifting sandstorm"
+msgstr "Dondurucu toz fırtınası"
+
+#: my-evolution/metar.c:409
+msgid "Freezing sandstorm"
+msgstr "Dondurucu toz fırtınası"
+
+#. DUSTSTORM
+#: my-evolution/metar.c:412
+msgid "Duststorm"
+msgstr "Toz fırtınası"
+
+#: my-evolution/metar.c:413
+#, fuzzy
+msgid "Duststorm in the vicinity"
+msgstr "Yer yer sisli"
+
+#: my-evolution/metar.c:414
+#, fuzzy
+msgid "Light duststorm"
+msgstr "Toz fırtınası"
+
+#: my-evolution/metar.c:415
+#, fuzzy
+msgid "Moderate duststorm"
+msgstr "Orta derecede sisli"
+
+#: my-evolution/metar.c:416
+#, fuzzy
+msgid "Heavy duststorm"
+msgstr "Toz fırtınası"
+
+#: my-evolution/metar.c:417
+#, fuzzy
+msgid "Shallow duststorm"
+msgstr "Toz fırtınası"
+
+#: my-evolution/metar.c:419
+#, fuzzy
+msgid "Partial duststorm"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:420
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:421
+#, fuzzy
+msgid "Blowing duststorm"
+msgstr "Toz fırtınası"
+
+#: my-evolution/metar.c:423
+#, fuzzy
+msgid "Drifting duststorm"
+msgstr "Toz fırtınası"
+
+#: my-evolution/metar.c:424
+#, fuzzy
+msgid "Freezing duststorm"
+msgstr "Dondurucu toz fırtınası"
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:427
+#, fuzzy
+msgid "Funnel cloud"
+msgstr "Az bulutlu"
+
+#: my-evolution/metar.c:428
+#, fuzzy
+msgid "Funnel cloud in the vicinity"
+msgstr "Yer yer kar yağışı"
+
+#: my-evolution/metar.c:429
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:430
+#, fuzzy
+msgid "Moderate funnel cloud"
+msgstr "Orta şiddette kar yağışı"
+
+#: my-evolution/metar.c:431
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:432
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:433
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:434
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:436
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:438
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
+msgid "Tornado"
+msgstr "Kasırga"
+
+#: my-evolution/metar.c:443
+msgid "Tornado in the vicinity"
+msgstr "Yer yer kasırga"
+
+#: my-evolution/metar.c:445
+msgid "Moderate tornado"
+msgstr "Orta şiddette kasırga"
+
+#: my-evolution/metar.c:446
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Orta şiddette kasırga"
+
+#: my-evolution/metar.c:449
+#, fuzzy
+msgid "Partial tornado"
+msgstr "Kısmi yağmurlu"
+
+#: my-evolution/metar.c:450
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Orta şiddette kasırga"
+
+#: my-evolution/metar.c:453
+#, fuzzy
+msgid "Drifting tornado"
+msgstr "Orta şiddette kasırga"
+
+#: my-evolution/metar.c:454
+#, fuzzy
+msgid "Freezing tornado"
+msgstr "Dondurucu kar"
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:457
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:458
+#, fuzzy
+msgid "Dust whirls in the vicinity"
+msgstr "Yer yer sisli"
+
+#: my-evolution/metar.c:459
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:460
+#, fuzzy
+msgid "Moderate dust whirls"
+msgstr "Orta şiddette kar yağışı"
+
+#: my-evolution/metar.c:461
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:462
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:463
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:464
+#, fuzzy
+msgid "Partial dust whirls"
+msgstr "Bölüm bölüm sisli"
+
+#: my-evolution/metar.c:466
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:468
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add n_ews feed"
+msgstr "Haber grubu _ekle"
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "C_elsius"
+msgstr "D_erece"
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Tüm _haber grupları:"
+
+#: my-evolution/my-evolution.glade.h:5
+msgid "How many days should the calendar display at once?"
+msgstr "Takvim aynı anda ekranda kaç gün göstersin?"
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "Ma_x number of items shown:"
+msgstr "_Gösterilecek azami öğe sayısı:"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "News Feed Settings"
+msgstr "Haber Grubu Ayarları"
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "One mont_h"
+msgstr "Bi_r ay"
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "One w_eek"
+msgstr "B_ir hafta"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "R_efresh time (seconds):"
+msgstr "Tazeleme aralığı (saniye):"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "Refresh _time (seconds):"
+msgstr "Tazeleme _aralığı (saniye):"
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "S_how full path for folders"
+msgstr "Dizinlerin tam yolunu göster"
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "Show _all tasks"
+msgstr "Tüm _görevleri göster"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "Show _today's tasks"
+msgstr "_Bugünün görevlerini göster"
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "Show temperatures in:"
+msgstr "Sıcaklığı göster:"
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "Tasks "
+msgstr "Görevler "
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "Weather Settings"
+msgstr "Hava durumu ayarları"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "_Fahrenheit"
+msgstr "_Fahrenheit"
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "_Five days"
+msgstr "Beş gün"
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "_Mail"
+msgstr "İ_leti"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "_News Feeds"
+msgstr "Haber _Grupları"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "_One day"
+msgstr "_Bir gün"
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "_Schedule"
+msgstr "_Zamanlama"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "_Weather"
+msgstr "_Hava Durumu"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution folder settings."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#, fuzzy
+msgid "Folder Settings"
+msgstr "E-posta Ayarları"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "The Evolution shell."
+msgstr "Evolution kabuğu."
+
+#: shell/e-activity-handler.c:162
+msgid "Show Details"
+msgstr "Ayrıntıları Göster"
+
+#: shell/e-activity-handler.c:164
+msgid "Cancel Operation"
+msgstr "İşlemi İ_ptal Et"
+
+#: shell/e-folder-dnd-bridge.c:53
+#, c-format
 msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"Cannot transfer folder:\n"
+"%s"
 msgstr ""
-"E-posta yapılandırma işlemi neredeyse tamamlandı. Kimlik ayarlarınız, gelen "
-"ve giden e-posta \n"
-"sunucunuz Evolution hesabınızı tanımlamak için yeterli olacaktır. Lütfen \n"
-" aşağıdaki boşluğa bu hesap için bir ad veriniz. Bu isim, sadece \n"
-"görüntüleme amaçlı olarak kullanılacaktır."
+"Dizin aktarılamadı:\n"
+"%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"
+msgstr "Dizin"
 
+#: shell/e-local-storage.c:178
+msgid "Drafts"
+msgstr "Taslaklar"
+
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-shortcuts.c:1055
+msgid "Inbox"
+msgstr "Gelen"
+
+#: shell/e-local-storage.c:180
+msgid "Outbox"
+msgstr "Giden"
+
+#: shell/e-local-storage.c:181
+msgid "Sent"
+msgstr "Gönderilen"
+
+#: shell/e-setup.c:126
+msgid "Evolution installation"
+msgstr "Evolution kurulumu"
+
+#: shell/e-setup.c:130
 msgid ""
-"You are sending an HTML-formatted message, but the following recipients do "
-"not want HTML-formatted mail:\n"
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
 msgstr ""
-"HTML biçimli bir ileti gönderiyorsunuz. Ancak aşağıdaki alıcılar, HTML "
-"biçimli iletiler almak istemiyorlar:\n"
+"Evolution'un bu yeni sürümü kişisel Evolution dizinine ek dosya\n"
+"yerleştirilmesini gerektirir."
 
-msgid "You cannot copy messages from this trash folder."
-msgstr "Bu çöp dizininden ileti kopyalayamazsınız."
+#: shell/e-setup.c:131
+msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+msgstr ""
+"Dosyaları kurmak için \"Tamam\" düğmesine, ya da işlemi durdurmak için "
+"\"İptal\" düğmesine tıklayın."
 
-msgid "You didn't enter a password."
-msgstr "Bir parola girmediniz."
+#: shell/e-setup.c:171
+msgid "Could not update files correctly"
+msgstr "Dosyalar düzgün bir şekilde güncellenemedi"
 
+#: shell/e-setup.c:194
+#, c-format
 msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
+"Cannot create the directory\n"
+"%s\n"
+"Error: %s"
 msgstr ""
-"Bir dizin seçmeyi unuttunuz.\n"
-"Lütfen geriye gidip geçerli bir dizin seçin."
+"%s dizini yaratılamadı\n"
+"\n"
+"Hata: %s"
 
-msgid "You have chosen an invalid date."
-msgstr "Geçersiz bir tarih seçtiniz."
+#: shell/e-setup.c:209
+#, c-format
+msgid ""
+"An error occurred in copying files into\n"
+"`%s'."
+msgstr ""
+"Dosyalar aşağıdaki dizine kopyalanırken hata oluştu\n"
+"`%s'."
 
-msgid "You have forgotten to choose a date."
-msgstr "Bir tarih seçmeyi unuttunuz."
+#: shell/e-setup.c:282
+#, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+"Evolution aşağıdaki dizini oluşturamadı:\n"
+"%s\n"
+"%s"
 
+#: shell/e-setup.c:300
+#, c-format
 msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
+"Directory %s\n"
+"does not have the right permissions. Please make it\n"
+"readable and executable and restart Evolution."
 msgstr ""
-"Bir e-posta istemcisi yapılandırmadınız.\n"
-"Bu işlemi bir e-posta gönderip almadan\n"
-"önce yapmanız gerekiyor.\n"
-"Şimdi yapılandırmak istiyor musunuz?"
 
-msgid "You have not filled in all of the required information."
-msgstr "Gerekli tüm bilgiler verilmedi."
+#: shell/e-setup.c:306
+#, c-format
+msgid ""
+"File %s\n"
+"should be removed to allow Evolution to work correctly.\n"
+"Please remove this file and restart Evolution."
+msgstr ""
 
-msgid "You have not set a mail transport method"
-msgstr "Posta iletim yöntemi düzenlenmemiş"
+#: shell/e-setup.c:329
+#, c-format
+msgid ""
+"The file `%s' is not a directory.\n"
+"Please move it in order to allow installation\n"
+"of the Evolution user files."
+msgstr ""
+"`%s' bir dizin değil.\n"
+"Evolution kullanıcı dosyalarının yüklenmesi\n"
+"bunu silmelisiniz."
+
+#: shell/e-setup.c:343
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:368
+#, c-format
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+"`%s' dizini var, ancak Evolution için \n"
+"kullanılmıyor. Lütfen Evolution kullanıcı dosyalarının\n"
+"kopyalanabilmesi için bu dizini taşıyınız."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Tamamlanma Tarihi"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Dizini seçin"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Özel Dizinler"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Dizin filtreleniyor"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Yerel Dizinler"
+
+#: shell/e-shell-folder-commands.c:140
+#, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Dizin kopyalanamadı: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, c-format
+msgid "Cannot move folder: %s"
+msgstr "Dizin taşınamadı: %s"
+
+#: shell/e-shell-folder-commands.c:190
+msgid "Cannot move a folder over itself."
+msgstr "Bir dizin kendi üzerine taşınamaz."
+
+#: shell/e-shell-folder-commands.c:192
+msgid "Cannot copy a folder over itself."
+msgstr "Bir dizin üzerine kopyalanamaz."
+
+#: shell/e-shell-folder-commands.c:206
+#, fuzzy
+msgid "Cannot move a folder into one of its descendants."
+msgstr "Bir dizin kendi üzerine taşınamaz."
+
+#: shell/e-shell-folder-commands.c:321
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr "\"%s\" dizinini kopyalamak için bir dizin adı verin:"
+
+#: shell/e-shell-folder-commands.c:325
+msgid "Copy folder"
+msgstr "Dizini kopyala"
+
+#: shell/e-shell-folder-commands.c:365
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr "\"%s\" dizinini taşımak için bir dizin adı verin:"
+
+#: shell/e-shell-folder-commands.c:369
+msgid "Move folder"
+msgstr "Dizini taşı"
+
+#: shell/e-shell-folder-commands.c:393
+#, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Dizin silinemedi:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:406
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Sil: \"%s\""
+
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Dizin silinemedi:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:488
+#, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Dizin yeniden adlandırılamadı:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:535
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "\"%s\" dizinini yeniden adlandır:"
+
+#: shell/e-shell-folder-commands.c:542
+msgid "Rename folder"
+msgstr "Dizini yeniden adlandır"
+
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:165
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Bu dizin adı geçersiz: %s"
+
+#: shell/e-shell-folder-commands.c:586
+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 ""
+"Dizin yeniden adlandırılamadı:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
+#, c-format
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr ""
+"Belirlenen dizin yaratılamadı:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:288
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Yeni Bir _Dizin Yarat..."
+
+#: shell/e-shell-folder-selection-dialog.c:393
+msgid "New..."
+msgstr "Yeni..."
+
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+msgid "(Untitled)"
+msgstr "(isimsiz)"
+
+#: shell/e-shell-importer.c:142
+msgid "Choose the type of importer to run:"
+msgstr ""
+
+#: shell/e-shell-importer.c:145
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Evolution'a aktarmak istediğiniz dosyayı seçin ve listenin bu dosyanın "
+"türünü belirleyin.\n"
+"\n"
+"Eğer dosya türünü bilmiyorsanız \"Otomatik\" seçeneğini işaretleyin. Bu "
+"durumda Evolution dosya türünü bulmaya çalışacaktır."
+
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+msgid "Please select the information that you would like to import:"
+msgstr ""
+
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"%s alınıyor\n"
+"%d öğesi alınıyor."
+
+#: shell/e-shell-importer.c:355
+#, fuzzy
+msgid "Select importer"
+msgstr "Dizini Seçin"
+
+#: shell/e-shell-importer.c:487
+#, c-format
+msgid "File %s does not exist"
+msgstr "%s dosyası bulunamadı."
+
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
+msgid "Evolution Error"
+msgstr "Evolution Hatası"
+
+#: shell/e-shell-importer.c:504
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Bunu açabilecek hiç bir filtre bulunamadı:\n"
+"%s"
+
+#: shell/e-shell-importer.c:514
+msgid "Importing"
+msgstr "Alınıyor"
+
+#: shell/e-shell-importer.c:522
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"%s alınıyor.\n"
+"%s başlatılıyor"
+
+#: shell/e-shell-importer.c:535
+#, c-format
+msgid "Error starting %s"
+msgstr "%s başlatırken hata oluştu"
+
+#: shell/e-shell-importer.c:554
+#, c-format
+msgid "Error loading %s"
+msgstr "%s yüklenirken hata oluştu"
+
+#: shell/e-shell-importer.c:571
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"%s alınıyor\n"
+"1. öğe alınıyor."
+
+#: shell/e-shell-importer.c:625
+msgid "Automatic"
+msgstr "Otomatik"
+
+#: shell/e-shell-importer.c:676
+msgid "Filename:"
+msgstr "Dosya adı:"
+
+#: shell/e-shell-importer.c:681
+msgid "Select a file"
+msgstr "Bir dosya seçin"
+
+#: shell/e-shell-importer.c:691
+msgid "File type:"
+msgstr "Dosya türü:"
+
+#: shell/e-shell-importer.c:716
+#, fuzzy
+msgid "Import data and settings from older programs"
+msgstr "Diğer programlardan veri al"
+
+#: shell/e-shell-importer.c:720
+msgid "Import a single file"
+msgstr "Tek dosya aktar"
 
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Lütfen bekleyiniz...\n"
+"Mevcut ayarlar aranıyor"
+
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+msgid "Starting Intelligent Importers"
+msgstr "Akıllı Aktarımcılar Başlatılıyor"
+
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "Gönderen:"
+
+#: shell/e-shell-importer.c:1080
+msgid "Select folder"
+msgstr "Dizini seçin"
+
+#: shell/e-shell-importer.c:1081
+msgid "Select a destination folder for importing this data"
+msgstr "Bu veriyi almak için hedef dizin seçin"
+
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+msgid "Import"
+msgstr "Aktar"
+
+#: shell/e-shell-offline-handler.c:582
+msgid "Closing connections..."
+msgstr "Bağlantılar kesiliyor..."
+
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"'%s' sırasında hata:\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Dizin eşzamanlı hale getiriliyor"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:326
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:326
+#, fuzzy
+msgid "Opening Folder"
+msgstr "%s dizini açılıyor"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:333
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "%s dizini açılıyor"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:338
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "%s içinde aç..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:435
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Dizinin adı değiştirilemedi: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:488
+#, fuzzy
+msgid "Cannot find the specified shared folder."
+msgstr ""
+"Belirlenen dizin yaratılamadı:\n"
+"%s"
+
+#: shell/e-shell-startup-wizard.c:159
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr ""
+"Evolution Posta Asistanı arayüzü başlatılamadı\n"
+"(%s)"
+
+#: shell/e-shell-startup-wizard.c:169
+msgid "Could not start the Evolution Mailer Assistant interface\n"
+msgstr "Evolution Posta Asistanı arayüzü başlatılamadı\n"
+
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Yeni"
+
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Dizin adı belirtilmedi"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Dizin içinde yeni satır karakteri bulunamaz."
+
+#: shell/e-shell-utils.c:127
+msgid "Folder name cannot contain slashes."
+msgstr "Dizin içinde bölü karakteri bulunamaz."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:196
+msgid "Bug buddy was not found in your $PATH."
+msgstr "Bug-buddy $PATH dizininde bulunamadı."
+
+#: shell/e-shell-view-menu.c:204
+msgid "Bug buddy could not be run."
+msgstr "Bug-buddy çalıştırılamadı."
+
+#: shell/e-shell-view-menu.c:248
+msgid "About Ximian Evolution"
+msgstr "Ximian Evolution Hakkında"
+
+#: shell/e-shell-view-menu.c:503
+msgid "Go to folder..."
+msgstr "Dizine git..."
+
+#: shell/e-shell-view-menu.c:504
+msgid "Select the folder that you want to open"
+msgstr "Açmak istediğiniz dizini seçin"
+
+#: shell/e-shell-view-menu.c:625
+#, fuzzy
+msgid "Create New Shortcut"
+msgstr "Yeni bir kısayol yarat"
+
+#: shell/e-shell-view-menu.c:626
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Kısayolu işaret etmek istediğiniz dizini seçin:"
+
+#: shell/e-shell-view-menu.c:786
+msgid "_Work Online"
+msgstr "Ç_evrimiçi Çalış"
+
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+msgid "_Work Offline"
+msgstr "Çe_vrimdışı Çalış"
+
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+msgid "Work Offline"
+msgstr "Çevrimdışı Çalış"
+
+#: shell/e-shell-view.c:226
+msgid "(No folder displayed)"
+msgstr "(dizin gösterilmiyor)"
+
+#: shell/e-shell-view.c:1847
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:1849
+msgid "(None)"
+msgstr "(Hiçbiri)"
+
+#: shell/e-shell-view.c:1896
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution çevrimiçi çlışıyor. Bu düğmeye tıklayarak çevrimdışı "
+"çalışmasını sağlayın."
+
+#: shell/e-shell-view.c:1903
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution çevrimdışı çalışmak üzere hazırlanıyor."
+
+#: shell/e-shell-view.c:1909
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution çevrimdışı çalışıyor. Bu düğmeye tıklayarak çevrimiçi "
+"çalışmasını sağlayın."
+
+#: shell/e-shell.c:175
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Etkinleştirme sisteminden gelen mesaj:\n"
+"%s"
+
+#: shell/e-shell.c:739
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Yerel kayıt kurulamadı -- %s"
+
+#: shell/e-shell.c:1876
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+
+#: shell/e-shell.c:2177
+msgid "Invalid arguments"
+msgstr "Geçersiz argümanlar"
+
+#: shell/e-shell.c:2179
+msgid "Cannot register on OAF"
+msgstr "OAF'a kayıt yapılamadı"
+
+#: shell/e-shell.c:2181
+msgid "Configuration Database not found"
+msgstr "Yapılandırma Veritabanı bulunamadı"
+
+#: shell/e-shell.c:2183 shell/e-storage.c:558
+msgid "Generic error"
+msgstr "Genel hata"
+
+#: shell/e-shortcuts-view.c:76
+msgid "Create new shortcut group"
+msgstr "Yeni bir kısayol grubu yarat"
+
+#: shell/e-shortcuts-view.c:77
+msgid "Group name:"
+msgstr "Grup adı:"
+
+#: shell/e-shortcuts-view.c:173
+#, c-format
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
+msgstr ""
+"Kısayol çubuğundan `%s' grubunu \n"
+"kaldırmak istiyor musunuz?"
+
+#: shell/e-shortcuts-view.c:178
+msgid "Don't remove"
+msgstr "Silme"
+
+#: shell/e-shortcuts-view.c:208
+msgid "Rename Shortcut Group"
+msgstr "Kısayol Grubunu Yeniden İsimlendir"
+
+#: shell/e-shortcuts-view.c:209
+msgid "Rename selected shortcut group to:"
+msgstr "Seçili kısayol grubunu yeniden isimlendir:"
+
+#: shell/e-shortcuts-view.c:241
+msgid "_Small Icons"
+msgstr "_Küçük Simgeler"
+
+#: shell/e-shortcuts-view.c:242
+msgid "Show the shortcuts as small icons"
+msgstr "Kısayolları küçük simgeler olarak göster"
+
+#: shell/e-shortcuts-view.c:244
+msgid "_Large Icons"
+msgstr "_Büyük Simgeler"
+
+#: shell/e-shortcuts-view.c:245
+msgid "Show the shortcuts as large icons"
+msgstr "Kısayolları büyük simgeler olarak göster"
+
+#: shell/e-shortcuts-view.c:256
+msgid "_New Group..."
+msgstr "Yeni _Grup..."
+
+#: shell/e-shortcuts-view.c:257
+msgid "Create a new shortcut group"
+msgstr "Yeni bir kısayol grubu yarat"
+
+#: shell/e-shortcuts-view.c:259
+msgid "_Remove this Group..."
+msgstr "B_u Grubu Sil..."
+
+#: shell/e-shortcuts-view.c:260
+msgid "Remove this shortcut group"
+msgstr "Bu kısayol grubunu sil"
+
+#: shell/e-shortcuts-view.c:262
+msgid "Re_name this Group..."
+msgstr "_Bu Grubu Yeniden Adlandır..."
+
+#: shell/e-shortcuts-view.c:263
+msgid "Rename this shortcut group"
+msgstr "Bu kısayol grubunu yeniden isimlendir"
+
+#: shell/e-shortcuts-view.c:268
+msgid "_Hide the Shortcut Bar"
+msgstr "Kısayol Çubuğunu _Gizle"
+
+#: shell/e-shortcuts-view.c:269
+msgid "Hide the shortcut bar"
+msgstr "Kısayol çubuğunu gizle"
+
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Yeni bir kısayol yarat"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Yeni bir kısayol yarat"
+
+#: shell/e-shortcuts-view.c:394
+msgid "Rename shortcut"
+msgstr "Kısayolu yeniden isimlendir"
+
+#: shell/e-shortcuts-view.c:395
+msgid "Rename selected shortcut to:"
+msgstr "Seçili kısayolları yeniden isimlendir:"
+
+#: shell/e-shortcuts-view.c:408
+msgid "Open the folder linked to this shortcut"
+msgstr "Bu kısayola bağlı dizini aç"
+
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+msgid "Open in New _Window"
+msgstr "Y_eni Pencerede Aç"
+
+#: shell/e-shortcuts-view.c:410
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Bu kısayola bağlı dizini yeni pencerede aç"
+
+#: shell/e-shortcuts-view.c:413
+msgid "_Rename"
+msgstr "_Yeniden adlandır"
+
+#: shell/e-shortcuts-view.c:413
+msgid "Rename this shortcut"
+msgstr "Bu kısayolu yeniden isimlendir"
+
+#: shell/e-shortcuts-view.c:415
+msgid "Re_move"
+msgstr "_Sil"
+
+#: shell/e-shortcuts-view.c:415
+msgid "Remove this shortcut from the shortcut bar"
+msgstr "Bu kısayolu kısayol çubuğundan sil"
+
+#: shell/e-shortcuts.c:641
+msgid "Error saving shortcuts."
+msgstr "Kısayolları kaydederken hata oldu."
+
+#: shell/e-shortcuts.c:1080
+msgid "Shortcuts"
+msgstr "Kısayollar"
+
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Chico"
+
+#: shell/e-storage.c:556
+msgid "No error"
+msgstr "Hata yok"
+
+#: shell/e-storage.c:560
+msgid "A folder with the same name already exists"
+msgstr "Aynı isimli bir dizin zaten var"
+
+#: shell/e-storage.c:562
+msgid "The specified folder type is not valid"
+msgstr "Belirtilen dizin türü geçerli değildir"
+
+#: shell/e-storage.c:564
+msgid "I/O error"
+msgstr "G/Ç hatası"
+
+#: shell/e-storage.c:566
+msgid "Not enough space to create the folder"
+msgstr "Dizin yaratmak için gerekli disk alanı yok"
+
+#: shell/e-storage.c:568
+msgid "The folder is not empty"
+msgstr "Dizin boş değil"
+
+#: shell/e-storage.c:570
+msgid "The specified folder was not found"
+msgstr "Belirtilen dizin bulunamadı"
+
+#: shell/e-storage.c:572
+msgid "Function not implemented in this storage"
+msgstr "Fonksiyon desteklenmiyor"
+
+#: shell/e-storage.c:576
+msgid "Operation not supported"
+msgstr "İşlem desteklenmiyor"
+
+#: shell/e-storage.c:578
+msgid "The specified type is not supported in this storage"
+msgstr "Bu kayıtta belirtilen tip desteklenmiyor"
+
+#: shell/e-storage.c:580
+msgid "The specified folder cannot be modified or removed"
+msgstr "Belirtilen dizin düzenlenemedi ya da silinemedi"
+
+#: shell/e-storage.c:582
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-storage.c:584
+msgid "Cannot create a folder with that name"
+msgstr "Bu isimde bir dizin yaratılamadı"
+
+#: 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 (...)"
+msgstr "%s (...)"
+
+#: shell/e-task-widget.c:196
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%%%d tamamlandı)"
+
+#: shell/evolution-folder-selector-button.c:94
+msgid "<click here to select a folder>"
+msgstr "<bir dizin seçmek için tıklayın>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Bilinmeyen hata."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Bileşen sisteminden gelen hata:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Etkinleştirme sisteminden gelen mesaj:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1145
+msgid "CORBA error"
+msgstr "CORBA hatası"
+
+#: shell/evolution-shell-component.c:1147
+msgid "Interrupted"
+msgstr "Kesintiye uğradı"
+
+#: shell/evolution-shell-component.c:1149
+msgid "Invalid argument"
+msgstr "Geçersiz argüman"
+
+#: shell/evolution-shell-component.c:1151
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1153
+msgid "No owner"
+msgstr "Sahibi yok"
+
+#: shell/evolution-shell-component.c:1155
+msgid "Not found"
+msgstr "Bulunamadı"
+
+#: shell/evolution-shell-component.c:1157
+msgid "Unsupported type"
+msgstr "Desteklenmeyen tür"
+
+#: shell/evolution-shell-component.c:1159
+msgid "Unsupported schema"
+msgstr "Desteklenmeyen şema"
+
+#: shell/evolution-shell-component.c:1161
+msgid "Unsupported operation"
+msgstr "Desteklenmeyen işlem"
+
+#: shell/evolution-shell-component.c:1163
+msgid "Internal error"
+msgstr "İç hata"
+
+#: shell/evolution-shell-component.c:1167
+msgid "Exists"
+msgstr "Bulunur"
+
+#: shell/evolution-shell-component.c:1169
+msgid "Invalid URI"
+msgstr "Geçersiz URI"
+
+#: shell/evolution-shell-component.c:1173
+msgid "Has subfolders"
+msgstr "Alt dizinler"
+
+#: shell/evolution-shell-component.c:1175
+msgid "No space left"
+msgstr "Hiç boş alan kalmadı"
+
+#: shell/evolution-shell-component.c:1177
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-test-component.c:49
+#, fuzzy
+msgid "Test type"
+msgstr "Dosya türü:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active connections"
+msgstr "Etkin bağlantılar"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+"Bu bağlantıları kapatmak ve İnternet bağlantısını ayırmak için Tamam "
+"düğmesine tıklayın"
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr "Makina"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr "Halen aşağıdaki bağlantılar etkin durumda:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Takvim"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "_Bağlantılar: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "İ_leti"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Görevler"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Dizin adı:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Dizin türü:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "Dizinin nerede yaratılacağını belirtin:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "Hesap"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Dizin adı:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "_Kullanıcı adı:"
+
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "Evolution Setup Assistant"
+msgstr "Evolution Kurulum Yardımcısı"
+
+#: shell/glade/evolution-startup-wizard.glade.h:5
+msgid "Importing Files"
+msgstr "Dosyalar Alınıyor"
+
+#: shell/glade/evolution-startup-wizard.glade.h:8
+msgid "Timezone "
+msgstr "Zaman Dilimi "
+
+#: shell/glade/evolution-startup-wizard.glade.h:9
+msgid "Welcome"
+msgstr "Hoşgeldiniz"
+
+#: shell/glade/evolution-startup-wizard.glade.h:10
+msgid ""
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
+"\n"
+"Please click the \"Next\" button to continue. "
+msgstr ""
+"Evolution'a hoşgeldiniz. Biraz sonra göreceğiniz bir kaç ekran,\n"
+"Evolution'un e-posta hesaplarınıza erişmesi ve diğer uygulamalardan\n"
+"aktarma yapması için gereken bilgileri alacaktır.\n"
+"\n"
+"Lütfen devam etmek için \"İleri\" düğmesine tıklayı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 ""
@@ -15969,1005 +26186,2401 @@ msgstr ""
 "\n"
 "Ayarları kaydetmek için \"Bitiş\" düğmesine tıklayın."
 
-msgid "You may not create two accounts with the same name."
-msgstr "İki hesabı aynı isimlerle oluşturamazsınız."
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "\"Aktar\" düğmesine tıklayarak dosyaları Evolution'a aktarın."
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Assistant"
+msgstr "Evolution Aktarma Yardımcısı"
 
+#: shell/importer/import.glade.h:3
+msgid "Import File (step 3 of 3)"
+msgstr "Dosya Aktar (adım 3/3)"
+
+#: shell/importer/import.glade.h:4
+msgid "Importer Type (step 1 of 3)"
+msgstr "Aktarıcı Türü (adım 1/3)"
+
+#: shell/importer/import.glade.h:5
+msgid "Select Importers (step 2 of 3)"
+msgstr "Aktarıcıları Seçin (adım 2/3)"
+
+#: shell/importer/import.glade.h:6
+msgid "Select a File (step 2 of 3)"
+msgstr "Bir dosya seçin (adım 2/3)"
+
+#: shell/importer/import.glade.h:7
 msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
+"importing external files into Evolution."
 msgstr ""
-"Sadece taslaklar dizinine kaydedilen\n"
-"iletileri düzenleyebilirsiniz."
+"Evolution dosya aktarma yardımcı programına hoşgeldiniz\n"
+"Bu sihirbaz ile harici dosyaları Evolution'a dahil edebileceksiniz."
+
+#: shell/importer/intelligent.c:190
+msgid "Importers"
+msgstr "Alıcılar"
+
+#: shell/importer/intelligent.c:196
+msgid "Don't import"
+msgstr "Alma"
+
+#: shell/importer/intelligent.c:198
+msgid "Don't ask me again"
+msgstr "Tekrar sorma"
+
+#: shell/importer/intelligent.c:208
+msgid "Evolution can import data from the following files:"
+msgstr "Evolution, aşağıdaki dosyalardan veri alabilir:"
+
+#: shell/main.c:96
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:102
+msgid "Evolution is now exiting ..."
+msgstr "Evolution'dan çıkılıyor..."
 
+#: shell/main.c:227
+#, no-c-format
 msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.8)\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
-"Sadece Gönderilen dizinine kaydedilen\n"
-"iletileri yeniden gönderebilirsiniz."
 
-msgid "You must be an attendee of the event."
-msgstr "Bu olayda bir katılımcı olarak görünmeniz gerekiyor."
+#: shell/main.c:250
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
 
-msgid "You must be working online to complete this operation"
-msgstr "Bu işlemi bitirmek için İnternet bağlantısı sağlamalısınız"
+#: shell/main.c:259
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Tekrar sorma"
 
-msgid "You must configure an account before you can send this email."
-msgstr "İleti göndermeden önce kendinize ait bir kimlik oluşturmalısınız."
+#: shell/main.c:394
+msgid "Cannot access the Ximian Evolution shell."
+msgstr "Ximian Evolution Kabuğuna erişilemedi."
 
-msgid "You must name this filter."
-msgstr "Bu filtrenin adını değiştirmelisiniz."
+#: shell/main.c:403
+#, c-format
+msgid "Cannot initialize the Ximian Evolution shell: %s"
+msgstr "Ximian Evolution Kabuğu başlatılamadı: %s"
 
-msgid "You must name this vfolder."
-msgstr "Bu vfolder adını değiştirmelisiniz."
+#: shell/main.c:485
+msgid "Disable splash screen"
+msgstr "Açılış ekranıni gösterme"
 
-msgid "You must specify recipients in order to send this message."
-msgstr "Bu e-postayı göndermek için alıcısını belirtmeniz gereklidir."
+#: shell/main.c:487
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Aktarma işlemi başlıyor"
 
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
+#: shell/main.c:489
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Akıllı Aktarımcılar Başlatılıyor"
+
+#: shell/main.c:491
+msgid "Send the debugging output of all components to a file."
+msgstr "Tüm hata ayıklama verilerini bir dosyaya yazdır."
+
+#: shell/main.c:493
+msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
-"İleti göndermeden önce bir posta\n"
-"iletim ayarı yapmalısınız."
 
+#: shell/main.c:511
+#, c-format
 msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
 msgstr ""
-"İleti göndermeden önce kendinize\n"
-"ait bir kimlik oluşturmalısınız."
 
-msgid "You need to to specify at least one folder as a source."
-msgstr "Kaynak için en az bir dizin belirtmelisiniz."
+#: shell/main.c:542
+msgid "Cannot initialize the Bonobo component system."
+msgstr "Bonobo parçalar sistemi başlatılamadı."
 
-msgid "Youngstown"
-msgstr "Youngstown"
+#: tools/evolution-addressbook-abuse.c:80
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+msgid "Error loading default addressbook."
+msgstr "Öntanımlı adres defteri yüklenemedi."
 
-msgid "Ypsilanti"
-msgstr "Ypsilanti"
+#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr "Girdi Dosyası"
 
-msgid "Yugoslavia"
-msgstr "Yugoslavya"
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr "Çıktı Dosyası"
 
-msgid "Yukon"
-msgstr "Yukon"
+#: tools/evolution-addressbook-import.c:80
+msgid "No filename provided."
+msgstr "Dosya adı belirtilmedi."
 
-msgid "Yuma MCAS"
-msgstr "Yuma MCAS"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Seçili iletileri başka dizine kopyala"
 
-msgid "Yurimaguas"
-msgstr "Yurimaguas"
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+msgid "Copy the selection"
+msgstr "Seçimi kopyala"
 
-msgid "Yuzhno-Sakhalinsk"
-msgstr "Yuzhno-Sakhalinsk"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "D_izine Kopyala..."
 
-msgid "Zacatecas"
-msgstr "Zacatecas"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+msgid "Cut the selection"
+msgstr "Seçimi kes"
 
-msgid "Zadar"
-msgstr "Zadar"
+#: ui/evolution-addressbook.xml.h:9
+msgid "Delete selected contacts"
+msgstr "Seçili bağlantıları sil"
 
-msgid "Zagreb"
-msgstr "Zagreb"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Seçili iletileri başka bir dizine taşı"
 
-msgid "Zakinthos"
-msgstr "Zakinthos"
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "_Dizine Taşı..."
 
-msgid "Zama Airfield"
-msgstr "Zama Airfield"
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
+msgid "Paste the clipboard"
+msgstr "Panoyu yapıştır"
 
-msgid "Zambia"
-msgstr "Zambia"
+#: ui/evolution-addressbook.xml.h:15
+msgid "Previews the contacts to be printed"
+msgstr "Yazdırılacak olan bağlantıları önizler"
 
-msgid "Zanesville"
-msgstr "Zanesville"
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Yazdırma Ö_nizlemesi"
 
-msgid "Zaragoza"
-msgstr "Zaragoza"
+#: ui/evolution-addressbook.xml.h:18
+msgid "Print selected contacts"
+msgstr "Seçili bağlantıları yazdır"
 
-msgid "Zell Am See"
-msgstr "Zell Am See"
+#: ui/evolution-addressbook.xml.h:20
+msgid "Save selected contacts as a VCard."
+msgstr "Seçili bağlantıları vCard olarak kaydet"
 
-msgid "Zimbabwe"
-msgstr "Zimbabwe"
+#: ui/evolution-addressbook.xml.h:21
+msgid "Select All"
+msgstr "Hepsini Seç"
 
-msgid "Zuni Pueblo"
-msgstr "Zuni Pueblo"
+#: ui/evolution-addressbook.xml.h:22
+msgid "Select all contacts"
+msgstr "Tüm Bağlantıkları Seç"
 
-msgid "Zurich"
-msgstr "Zürih"
+#: ui/evolution-addressbook.xml.h:23
+msgid "Send a mess to the selected contacts."
+msgstr "Seçilen bağlantılara bir mesaj gönder."
 
-msgid "_12 hour (AM/PM)"
-msgstr "_12 saat (ÖÖ/ÖS)"
+#: ui/evolution-addressbook.xml.h:24
+msgid "Send message to contact"
+msgstr "Bağlantıya ileti gönder"
 
-msgid "_24 hour"
-msgstr "_24 saat"
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send selected contacts to another person."
+msgstr "Seçilen bağlantıları başkasına gönder."
 
-msgid "_<<"
-msgstr "_<<"
+#: ui/evolution-addressbook.xml.h:26
+msgid "Stop"
+msgstr "Dur"
 
-msgid "_About Ximian Evolution..."
-msgstr "Ximian _Evolution Hakkında..."
+#: ui/evolution-addressbook.xml.h:27
+msgid "Stop Loading"
+msgstr "Yüklemeyi Durdur"
 
-msgid "_Account name:"
-msgstr "_Hesap adı:"
+#: ui/evolution-addressbook.xml.h:28
+#, fuzzy
+msgid "View the current contact"
+msgstr "şimdiki zaman"
 
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "_Eylemler"
 
-msgid "_Add"
-msgstr "_Ekle"
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+msgid "_Forward Contact..."
+msgstr "_Bağlantıyı Gönder..."
 
-msgid "_Address:"
-msgstr "_Adres:"
+#: ui/evolution-addressbook.xml.h:35
+msgid "_Move to Folder..."
+msgstr "_Dizine Taşı..."
 
-msgid "_Addressbook Sources..."
-msgstr "_Adres Defteri Kaynakları..."
+#: ui/evolution-addressbook.xml.h:39
+msgid "_Save as VCard"
+msgstr "VCard Olarak Kaydet"
 
-msgid "_All People and Resources"
-msgstr "_Tüm Kişiler ve Kaynaklar"
+#: ui/evolution-addressbook.xml.h:40
+msgid "_Search for Contacts"
+msgstr "Bağ_lantıları Ara"
 
-msgid "_Always load images off the net"
-msgstr "_Resimleri her zaman ağdan indir"
+#: ui/evolution-addressbook.xml.h:41
+msgid "_Select All"
+msgstr "_Hepsini Seç"
 
-msgid "_Always sign outgoing messages when using this account"
-msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
+#: ui/evolution-addressbook.xml.h:42
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "B_ağlantıya Mesaj Gönder..."
 
-msgid "_Apply Filters"
-msgstr "_Filtreleri Uygula"
+#: ui/evolution-calendar.xml.h:4
+msgid "Day"
+msgstr "Gün"
 
-msgid "_Appointment..."
-msgstr "_Randevu..."
+#: ui/evolution-calendar.xml.h:5
+msgid "Delete the appointment"
+msgstr "Randevuyu sil"
 
-msgid "_Ask for confirmation when deleting items"
-msgstr "Öğ_eleri silmeden önce sor"
+#: ui/evolution-calendar.xml.h:6
+msgid "Go To"
+msgstr "Git"
 
-msgid "_Attachment..."
-msgstr "_Eklenti"
+#: ui/evolution-calendar.xml.h:7
+msgid "Go back"
+msgstr "Geri git"
 
-msgid "_Authentication Type: "
-msgstr "_Kimlik Denetim Türü: "
+#: ui/evolution-calendar.xml.h:8
+msgid "Go forward"
+msgstr "İleri git"
 
-msgid "_Automatically check for new mail"
-msgstr "_Yeni iletileri otomatik denetle:"
+#: ui/evolution-calendar.xml.h:9
+msgid "Go to _Date"
+msgstr "_Tarihe Git"
 
-msgid "_Autopick"
-msgstr "_Otomatikman seç"
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to a specific date"
+msgstr "Belirli bir tarihe git"
 
-msgid "_Bcc Field"
-msgstr "_Gizli Alanı"
+#: ui/evolution-calendar.xml.h:12
+msgid "Go to today"
+msgstr "Bugüne git"
 
-msgid "_Calendar Settings..."
-msgstr "_Takvim Ayarları..."
+#: ui/evolution-calendar.xml.h:13
+msgid "Month"
+msgstr "Ay"
 
-msgid "_Category:"
-msgstr "_Kategori:"
+#: ui/evolution-calendar.xml.h:15
+msgid "Previews the calendar to be printed"
+msgstr "Yazdırılacak olan takvimi önizler"
 
-msgid "_Cc Field"
-msgstr "_Bilgi Alanı"
+#: ui/evolution-calendar.xml.h:17
+msgid "Print this calendar"
+msgstr "Bu takvimi yazdır"
 
-msgid "_Certificate ID:"
-msgstr "_Sertifika No:"
+#: ui/evolution-calendar.xml.h:18
+#, fuzzy
+msgid "Publish Free/Busy information for this calendar"
+msgstr "_Boş/Meşgul Bilgisini Yayınla"
 
-msgid "_Change Organizer"
-msgstr "O_rganizatörü Değiştir"
+#: ui/evolution-calendar.xml.h:19
+msgid "Show one day"
+msgstr "Bir gün göster"
 
-msgid "_City:"
-msgstr "Ş_ehir:"
+#: ui/evolution-calendar.xml.h:20
+msgid "Show one month"
+msgstr "Bir ay göster"
 
-msgid "_Close"
-msgstr "_Kapat"
+#: ui/evolution-calendar.xml.h:21
+msgid "Show one week"
+msgstr "Bir hafta göster"
 
-msgid "_Contact"
-msgstr "_Bağlantı"
+#: ui/evolution-calendar.xml.h:22
+msgid "Show the working week"
+msgstr "Çalışma günlerini göster"
 
-msgid "_Contact List"
-msgstr "B_ağlantı Listesi"
+#: ui/evolution-calendar.xml.h:23
+msgid "Week"
+msgstr "Hafta"
 
-msgid "_Contacts..."
-msgstr "_Bağlantılar..."
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this item"
+msgstr "Bu öğeyi kapat"
 
-msgid "_Copy"
-msgstr "_Kopyala"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Bu öğeyi sil"
 
-msgid "_Copy to Folder"
-msgstr "Dizine _Kopyala"
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+msgid "Main toolbar"
+msgstr "Ana araç çubuğu"
 
-msgid "_Copy to Folder..."
-msgstr "D_izine Kopyala..."
+#: ui/evolution-comp-editor.xml.h:7
+msgid "Preview the printed item"
+msgstr "Yazdırılacak olan öğeyi önizle"
 
-msgid "_Copy..."
-msgstr "_Kopyala..."
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Bu öğeyi yazdır"
 
-msgid "_Create Filter From Message"
-msgstr "İ_letiden Bir Filtre Yarat"
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+msgid "Save"
+msgstr "Kaydet"
 
-msgid "_Current View"
-msgstr "Ş_imdiki Görünüm"
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Farklı Kaydet..."
 
-msgid "_Custom recurrence"
-msgstr "_Özel tekrar"
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save and Close"
+msgstr "Kaydet ve Kapat"
 
-msgid "_Delegate To..."
-msgstr "_Dağıt..."
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save the item and close the dialog box"
+msgstr "Öğeyi kaydet ve iletişim penceresini kapat"
 
-msgid "_Delete"
-msgstr "_Sil"
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save this item to disk"
+msgstr "Bu öğeyi diske kaydet"
 
-msgid "_Delete Selected Tasks"
-msgstr "_Seçilen Görevleri Sil"
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:49
+msgid "_File"
+msgstr "_Dosya"
 
-msgid "_Delete all"
-msgstr "He_psini sil"
+#: ui/evolution-contact-editor.xml.h:5
+msgid "Print En_velope..."
+msgstr "_Zarfı Yazdır..."
 
-msgid "_Delete this Appointment"
-msgstr "Bu _Randevuyu Sil"
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "_Farklı Kaydet..."
 
-msgid "_Delete this Task"
-msgstr "B_u Görevi Sil"
+#: ui/evolution-contact-editor.xml.h:9
+msgid "Save the contact and close the dialog box"
+msgstr "Bağlantıyı kaydet ve diyalog penceresini kapat"
 
-msgid "_Display"
-msgstr "_Göster"
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "B_ağlantıya Mesaj Gönder..."
 
-msgid "_Display folders:"
-msgstr "_Dizinleri görüntüle:"
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Kaydet"
 
-msgid "_Display stations:"
-msgstr "İstasyonları _görüntüle:"
+#: ui/evolution-contact-list-editor.xml.h:3
+msgid "Delete this list"
+msgstr "Bu listeyi sil"
 
-msgid "_Displayed feeds:"
-msgstr "_Görüntülenecek servisler:"
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Sil..."
 
-msgid "_Drafts folder:"
-msgstr "_Taslaklar dizini:"
+#: ui/evolution-contact-list-editor.xml.h:7
+msgid "Save the list and close the dialog box"
+msgstr "Listeyi kaydet ve iletişim penceresini kapat"
 
-msgid "_Due Date:"
-msgstr "_Tarihe Göre:"
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Se_nd list to other..."
+msgstr "L_isteyi başkasına gönder..."
 
-msgid "_Edit"
-msgstr "_Düzenle"
+#: ui/evolution-contact-list-editor.xml.h:9
+msgid "Send _message to list..."
+msgstr "İletiyi _listeye gönder..."
 
-msgid "_Edit appointment"
-msgstr "_Toplantıyı düzenle"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
+msgstr "Toplantıyı İ_ptal Et"
 
-msgid "_Edit as New Message..."
-msgstr "Yeni İleti Olarak _Düzenle..."
+#: ui/evolution-event-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr "Bu öğe için toplantıyı iptal et"
 
-msgid "_Email Address:"
-msgstr "_E-posta Adresi:"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+msgid "Forward as i_Calendar"
+msgstr "i_Calendar Olarak Yönlendir"
 
-msgid "_Email address:"
-msgstr "_E-posta adresi:"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
+msgid "Forward this item via email"
+msgstr "Bu öğeyi ileti ile yönlendir"
 
-msgid "_Empty trash folders on exit"
-msgstr "Çı_karken çöp dizinini sil"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Obtain the latest meeting information"
+msgstr "Son toplantı bilgisini al"
 
-msgid "_End of day:"
-msgstr "_Gün bitimi:"
+#: ui/evolution-event-editor.xml.h:8
+msgid "Re_fresh Meeting"
+msgstr "T_oplantıyı Tazele"
 
-msgid "_End time:"
-msgstr "B_itiş tarihi:"
+#: ui/evolution-event-editor.xml.h:9
+msgid "Schedule _Meeting"
+msgstr "Toplantı Zamanı Düzenle"
 
-msgid "_Expunge"
-msgstr "_Sil"
+#: ui/evolution-event-editor.xml.h:10
+msgid "Schedule a meeting for this item"
+msgstr "Bu öğe _için toplantı zamanı düzenle"
 
-msgid "_Fahrenheit"
-msgstr "_Fahrenheit"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customize My Evolution"
+msgstr "Evolution'ı Özelleştir"
 
-msgid "_File"
-msgstr "_Dosya"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "Şimdiki e-posta işlemini iptal et"
+
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose _New Message"
+msgstr "_Yeni İleti Oluştur"
+
+#: ui/evolution-mail-global.xml.h:4
+msgid "Create or edit rules for filtering new mail"
+msgstr "Yeni iletileri süzmek için kural oluştur"
 
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit virtual folder definitions"
+msgstr "Sanal dizin tanımları oluştur/düzenle"
+
+#: ui/evolution-mail-global.xml.h:6
+msgid "Empty _Trash"
+msgstr "Çöpü _Boşalt"
+
+#: ui/evolution-mail-global.xml.h:7
+msgid "Forget _Passwords"
+msgstr "Parolaları _Unut"
+
+#: ui/evolution-mail-global.xml.h:8
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Bilinen parolaları unut (tüm parolaları yeniden girmeniz gerekecektir)"
+
+#: ui/evolution-mail-global.xml.h:9
+msgid "Open a window for composing a mail message"
+msgstr "İletiyi düzenlemek için bir pencere aç"
+
+#: ui/evolution-mail-global.xml.h:10
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Tüm dizindeki tüm silinmiş iletileri tamamen sil"
+
+#: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Yeni İleti"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "İletiler dizine kaydediliyor"
+
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Dizinlere Üye Ol..."
+
+#: ui/evolution-mail-global.xml.h:14
+msgid "Show message preview window"
+msgstr "İleti önizleme penceresini göster"
+
+#: ui/evolution-mail-global.xml.h:15
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Uzak sunuculardaki dizinlere üyelik işlemini gerçekleştir"
+
+#: ui/evolution-mail-global.xml.h:16
+msgid "Virtual Folder _Editor..."
+msgstr "Sanal Dizin _Düzenleyici..."
+
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtreler..."
 
-msgid "_First:"
-msgstr "_Birinci:"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Preview Pane"
+msgstr "Önizleme _Panosu"
 
-msgid "_Five days"
-msgstr "Beş gün"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Bu dizinin özelliklerini değiştir"
+
+#: ui/evolution-mail-list.xml.h:2
+msgid "Copy selected messages"
+msgstr "Seçili iletileri kopyala"
+
+#: ui/evolution-mail-list.xml.h:3
+msgid "Cu_t"
+msgstr "K_es"
+
+#: ui/evolution-mail-list.xml.h:4
+msgid "Cut selected messages"
+msgstr "Seçili iletileri kes"
+
+#: ui/evolution-mail-list.xml.h:5
+msgid "Hide S_elected Messages"
+msgstr "Seçili İletileri Gizle"
+
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide _Deleted Messages"
+msgstr "_Silenen İletileri Gizle"
+
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Read Messages"
+msgstr "_Okunan İletileri Gizle"
+
+#: ui/evolution-mail-list.xml.h:8
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "Silinen iletileri üzerine çizgi çekmek yerine gizle"
+
+#: ui/evolution-mail-list.xml.h:9
+msgid "Mark All as R_ead"
+msgstr "_Tümünü Okunmuş Olarak İşaretle"
+
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark all visible messages as read"
+msgstr "Tüm görünen iletileri okunmuş olarak işaretle"
+
+#: ui/evolution-mail-list.xml.h:11
+msgid "Paste message in the clipboard"
+msgstr "İletiyi panoya yapıştır"
+
+#: ui/evolution-mail-list.xml.h:12
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Bu dizindeki tüm silinmiş iletileri tamamen sil"
 
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Tümünü _Seç"
+
+#: ui/evolution-mail-list.xml.h:14
+msgid "Select _Thread"
+msgstr "Konumu _Seç"
+
+#: ui/evolution-mail-list.xml.h:15
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:16
+#, fuzzy
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Seçilen iletinin göndericisine bir cevap gönder"
+
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all visible messages"
+msgstr "Tüm görünen iletileri seç"
+
+#: ui/evolution-mail-list.xml.h:18
+msgid "Sh_ow Hidden Messages"
+msgstr "_Gizli İletileri Göster"
+
+#: ui/evolution-mail-list.xml.h:19
+msgid "Show messages that have been temporarily hidden"
+msgstr "Geçici olarak gizlenmiş iletileri göster"
+
+#: ui/evolution-mail-list.xml.h:20
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Okunmuş iletileri geçici olarak gizle"
+
+#: ui/evolution-mail-list.xml.h:21
+msgid "Temporarily hide the selected messages"
+msgstr "Seçili iletileri geçici olarak gizle"
+
+#: ui/evolution-mail-list.xml.h:22
+msgid "Threaded Message list"
+msgstr "Konumlandırılan İleti listesi"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr "_Sil"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Dizin"
 
-msgid "_Folder Bar"
-msgstr "_Dizin Çubuğu"
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "S_eçimi Tersine Çevir"
 
-msgid "_Folder:"
-msgstr "_Dizin:"
+#: ui/evolution-mail-list.xml.h:30
+msgid "_Properties..."
+msgstr "Ö_zellikler..."
 
-msgid "_Font..."
-msgstr "_Yazıtipi..."
+#: ui/evolution-mail-list.xml.h:31
+msgid "_Threaded Message List"
+msgstr "_Konumlandırılan İleti Listesi"
 
-msgid "_Forward"
-msgstr "_Yönlendir"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Göndereni Adres Defterine Ekle"
 
-msgid "_Forward Contact..."
-msgstr "_Bağlantıyı Gönder..."
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Filtreleri Uygula"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Göndereni Adres Defterine Ekle"
+
+#: ui/evolution-mail-message.xml.h:4
+msgid "Apply filter rules to the selected messages"
+msgstr "Seçilen iletilere filtre kurallarını uygula"
+
+#: ui/evolution-mail-message.xml.h:5
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Seçili iletideki tüm alıcılara bir cevap gönder"
+
+#: ui/evolution-mail-message.xml.h:6
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Seçilen iletinin e-posta listesine bir cevap gönder"
+
+#: ui/evolution-mail-message.xml.h:7
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Seçilen iletinin göndericisine bir cevap gönder"
+
+#: ui/evolution-mail-message.xml.h:9
+msgid "Copy selected messages to another folder"
+msgstr "Seçili iletileri başka dizine kopyala"
+
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create _Virtual Folder From Message"
+msgstr "İletiden _Sanal Dizin Yarat"
+
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages from this sender"
+msgstr "Bu gönderene göre iletileri filtrelemek için kural yarat"
+
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Bu alıcılara göre iletileri filtrelemek için kural yarat"
+
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Bu e-posta listesine göre iletileri filtrelemek için kural yarat"
+
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a rule to filter messages with this subject"
+msgstr "Bu konuyla iletileri filtrelemek için kural oluştur"
+
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for these recipients"
+msgstr "Bu alıcılar için bir sanal dizin yarat"
+
+#: ui/evolution-mail-message.xml.h:16
+msgid "Create a virtual folder for this mailing list"
+msgstr "Bu e-posta listesi için bir sanal dizin yarat"
+
+#: ui/evolution-mail-message.xml.h:17
+msgid "Create a virtual folder for this sender"
+msgstr "Bu gönderen için bir sanal dizin yarat"
+
+#: ui/evolution-mail-message.xml.h:18
+msgid "Create a virtual folder for this subject"
+msgstr "Bu konu için bir sanal dizin yarat"
+
+#: ui/evolution-mail-message.xml.h:19
+msgid "Decrease the text size"
+msgstr "Metin boyunu azalt"
+
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the next important message"
+msgstr "Sonraki önemli iletiyi göster"
+
+#: ui/evolution-mail-message.xml.h:22
+msgid "Display the next message"
+msgstr "Sonraki iletiyi göster"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the next unread message"
+msgstr "Sonraki okunmamış iletiyi göster"
+
+#: ui/evolution-mail-message.xml.h:24
+msgid "Display the next unread thread"
+msgstr "Sonraki okunmamış konumu göster"
+
+#: ui/evolution-mail-message.xml.h:25
+msgid "Display the previous important message"
+msgstr "Önceki önemli iletiyi göster"
+
+#: ui/evolution-mail-message.xml.h:26
+msgid "Display the previous message"
+msgstr "Önceki iletiyi göster"
+
+#: ui/evolution-mail-message.xml.h:27
+msgid "Display the previous unread message"
+msgstr "Önceki okunmamış iletiyi göster"
+
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Yönlendir"
+
+#: ui/evolution-mail-message.xml.h:29
+msgid "Filter on Mailing _List..."
+msgstr "_E-posta Listelerine Göre Filtrele..."
+
+#: ui/evolution-mail-message.xml.h:30
+msgid "Filter on Se_nder..."
+msgstr "_Gönderene Göre Filtrele..."
+
+#: ui/evolution-mail-message.xml.h:31
+msgid "Filter on _Recipients..."
+msgstr "_Alıcılara Göre Filtrele..."
+
+#: ui/evolution-mail-message.xml.h:32
+msgid "Filter on _Subject..."
+msgstr "_Konuya Göre Filtrele..."
+
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Seçili iletileri silmek için işaretle"
+
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "_Tam İsim..."
+
+#: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "HTML iletideki resimleri yükle"
+
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Seçilen iletiyi birisine yönlendir"
+
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Seçilen iletiyi birisine yönlendir"
+
+#: ui/evolution-mail-message.xml.h:39
+msgid "Forward the selected message to someone"
+msgstr "Seçilen iletiyi birisine yönlendir"
+
+#: ui/evolution-mail-message.xml.h:40
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Seçilen iletiyi birisine eklenti olarak yönlendir"
+
+#: ui/evolution-mail-message.xml.h:41
+msgid "Increase the text size"
+msgstr "Metin boyunu büyüt"
+
+#: ui/evolution-mail-message.xml.h:42
+msgid "Load _Images"
+msgstr "Resimleri _Yükle"
+
+#: ui/evolution-mail-message.xml.h:44
+msgid "Mark as I_mportant"
+msgstr "Ön_emli Olarak İşaretle"
+
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Oku_nmamış Olarak İşaretle"
+
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark as Unimp_ortant"
+msgstr "Ö_nemsiz Olarak İşaretle"
+
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected message(s) as having been read"
+msgstr "Seçili iletileri okunmuş olarak işaretle"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected message(s) as important"
+msgstr "Seçili iletileri önemli olarak işaretle"
+
+#: ui/evolution-mail-message.xml.h:49
+#, fuzzy
+msgid "Mark the selected message(s) as not having been read"
+msgstr "Seçili iletileri okunmamış olarak işaretle"
+
+#: ui/evolution-mail-message.xml.h:50
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
+msgstr "Seçili iletileri önemsiz olarak işaretle"
+
+#: ui/evolution-mail-message.xml.h:51
+msgid "Mark the selected messages for deletion"
+msgstr "Seçili iletileri silmek için işaretle"
+
+#: ui/evolution-mail-message.xml.h:52
+msgid "Move"
+msgstr "Taşı"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Move selected message(s) to another folder"
+msgstr "Seçili iletileri başka bir dizine taşı"
+
+#: ui/evolution-mail-message.xml.h:54
+msgid "Next"
+msgstr "İleri"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Sonraki Önemli İleti"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Next _Thread"
+msgstr "Sonraki Konum"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
+msgstr "Sonraki Okunmamış İleti"
+
+#: ui/evolution-mail-message.xml.h:58
+msgid "Open the selected message in a new window"
+msgstr "Seçilen iletiyi yeni bir pencerede aç"
+
+#: ui/evolution-mail-message.xml.h:59
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Seçilen iletiyi düzenleyicide yeniden göndermek üzere aç"
+
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr "Asıl Boyut"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Önceki Okunmamış İleti"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Post a Reply"
+msgstr "Görev Yanıtı"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "İletiyi belirtilen dizine kaydet"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Önceki Önemli İleti"
+
+#: ui/evolution-mail-message.xml.h:65
+msgid "Preview the message to be printed"
+msgstr "Yazdırılacak İletiyi Önizle"
+
+#: ui/evolution-mail-message.xml.h:66
+msgid "Previous"
+msgstr "Geri"
+
+#: ui/evolution-mail-message.xml.h:69
+msgid "Print this message"
+msgstr "Bu iletiyi yazdır"
+
+#: ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Re_direct"
+msgstr "Woensdrecht"
+
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Seçilen iletiyi birisine yönlendir"
+
+#: ui/evolution-mail-message.xml.h:76
+msgid "Reset the text to its original size"
+msgstr "Metni orjinal boyuna getir"
+
+#: ui/evolution-mail-message.xml.h:77
+msgid "S_earch Message..."
+msgstr "İle_tide Ara..."
+
+#: ui/evolution-mail-message.xml.h:78
+msgid "S_maller"
+msgstr "_Daha küçük"
+
+#: ui/evolution-mail-message.xml.h:79
+msgid "Save the message as a text file"
+msgstr "İletiyi bir dosyaya kaydet"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Search for text in the body of the displayed message"
+msgstr "Görüntülenen ileti içinde bir metin ara"
+
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "Set up the page settings for your current printer"
+msgstr "Güncel yazıcı için sayfa ayarlarını yap"
+
+#: ui/evolution-mail-message.xml.h:82
+msgid "Show Email _Source"
+msgstr "İleti _Kaynağını Göster"
+
+#: ui/evolution-mail-message.xml.h:83
+msgid "Show Full _Headers"
+msgstr "_Kapsamlı Başlıkları Göster"
+
+#: ui/evolution-mail-message.xml.h:84
+msgid "Show message in the normal style"
+msgstr "İletiyi normal biçemde göster"
+
+#: ui/evolution-mail-message.xml.h:85
+msgid "Show message with all email headers"
+msgstr "İletiyi tüm başlıklarıyla göster"
+
+#: ui/evolution-mail-message.xml.h:86
+msgid "Show the raw email source of the message"
+msgstr "İletinin kaynağını göster"
+
+#: ui/evolution-mail-message.xml.h:87
+msgid "Text Si_ze"
+msgstr "Metin _Boyu"
+
+#: ui/evolution-mail-message.xml.h:88
+msgid "Un-delete the selected messages"
+msgstr "Seçilen iletiyi silme"
+
+#: ui/evolution-mail-message.xml.h:89
+msgid "VFolder on Mailing _List..."
+msgstr "_E-posta Listesine Göre VFolder..."
 
+#: ui/evolution-mail-message.xml.h:90
+msgid "VFolder on Se_nder..."
+msgstr "_Gönderene Göre VFolder..."
+
+#: ui/evolution-mail-message.xml.h:91
+msgid "VFolder on _Recipients..."
+msgstr "_Alıcılara Göre VFolder..."
+
+#: ui/evolution-mail-message.xml.h:92
+msgid "VFolder on _Subject..."
+msgstr "_Konuya Göre VFolder..."
+
+#: ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Attached"
+msgstr "Ekle"
+
+#: ui/evolution-mail-message.xml.h:95
+msgid "_Copy to Folder"
+msgstr "Dizine _Kopyala"
+
+#: ui/evolution-mail-message.xml.h:96
+msgid "_Create Filter From Message"
+msgstr "İ_letiden Bir Filtre Yarat"
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "İletiyi _Yönlendir"
 
-msgid "_Fri"
-msgstr "_Cum"
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Go To"
+msgstr "Git"
+
+#: ui/evolution-mail-message.xml.h:100
+#, fuzzy
+msgid "_Inline"
+msgstr "Bağlantılı"
+
+#: ui/evolution-mail-message.xml.h:101
+msgid "_Larger"
+msgstr "_Daha büyük"
+
+#: ui/evolution-mail-message.xml.h:102
+msgid "_Message Display"
+msgstr "İleti _Görünümü"
+
+#: ui/evolution-mail-message.xml.h:103
+msgid "_Move to Folder"
+msgstr "Dizine _Taşı"
+
+#: ui/evolution-mail-message.xml.h:104
+#, fuzzy
+msgid "_Next Message"
+msgstr "Sonraki İleti"
+
+#: ui/evolution-mail-message.xml.h:105
+msgid "_Normal Display"
+msgstr "Normal _Gösterim"
+
+#: ui/evolution-mail-message.xml.h:106
+msgid "_Open Message"
+msgstr "İ_letiyi Aç "
+
+#: ui/evolution-mail-message.xml.h:107
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Önceki İleti"
+
+#: ui/evolution-mail-message.xml.h:109
+msgid "_Quoted"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "Y_eniden İsimlendir..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+msgid "_Tools"
+msgstr "_Araçlar"
+
+#: ui/evolution-mail-message.xml.h:114
+msgid "_Undelete"
+msgstr "_Silme"
+
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Bu pencereyi kapat"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:46
+msgid "_Close"
+msgstr "_Kapat"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+msgid "_View"
+msgstr "_Göster"
+
+#: ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Ekle"
+
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+msgid "Close the current file"
+msgstr "Güncel dosyayı kapat"
+
+#: ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr "İmza dışında tümünü sil"
+
+#: ui/evolution-message-composer.xml.h:6
+msgid "Encrypt this message with PGP"
+msgstr "Bu iletiyi PGP ile şifrele"
+
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr "Bu iletiyi S/MIME şifreleme sertifikasıyla şifrele"
+
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+msgid "For_mat"
+msgstr "Biçi_m"
+
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
+msgstr "H_TML"
+
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Aç"
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr "Bir dosya aç"
+
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr "PGP Şifre"
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr "PGP İmza"
+
+#: ui/evolution-message-composer.xml.h:14
+msgid "S/MIME Encrypt"
+msgstr "S/MIME Şifreleme"
+
+#: ui/evolution-message-composer.xml.h:15
+msgid "S/MIME Sign"
+msgstr "S/MIME İmza"
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save As"
+msgstr "Farklı Kaydet"
+
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save _Draft"
+msgstr "_Taslağı Kaydet"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save in folder..."
+msgstr "Dizine kaydet..."
+
+#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save the current file"
+msgstr "Şimdiki zamanı kaydet"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr "Güncel dosyayı farklı bir isimle kaydet"
+
+#: ui/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "İletiyi belirtilen dizine kaydet"
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Gönder"
+
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
+msgid "Send the mail in HTML format"
+msgstr "İletiyi HTML olarak gönder"
+
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
+msgstr "Bu iletiyi şimdi gönder"
+
+#: ui/evolution-message-composer.xml.h:27
+msgid "Show / hide attachments"
+msgstr "Ekleri göster/gizle"
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Show _attachments"
+msgstr "Ekleri _göster"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Show attachments"
+msgstr "Ekleri göster"
+
+#: ui/evolution-message-composer.xml.h:30
+msgid "Sign this message with your PGP key"
+msgstr "PGP anahtarıyla bu iletiyi imzala"
+
+#: ui/evolution-message-composer.xml.h:31
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "S/MIME imza sertifikasıyla bu iletiyi imzala"
+
+#: ui/evolution-message-composer.xml.h:32
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Bcc alanını gösterir/gizler"
+
+#: ui/evolution-message-composer.xml.h:33
+msgid "Toggles whether the CC field is displayed"
+msgstr "Cc alanını gösterir/gizler"
+
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Gönderen alanını gösterir/gizler"
 
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Yanıtla alanını gösterir/gizler"
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "_Attachment..."
+msgstr "_Eklenti"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "_Bcc Field"
+msgstr "_Gizli Alanı"
+
+#: ui/evolution-message-composer.xml.h:38
+msgid "_Cc Field"
+msgstr "_Bilgi Alanı"
+
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Delete all"
+msgstr "He_psini sil"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Gönderen Alanı"
 
-msgid "_Full Name:"
-msgstr "_Tam isim:"
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Insert"
+msgstr "_Ekle"
 
-msgid "_General"
-msgstr "_Genel"
+#: ui/evolution-message-composer.xml.h:45
+msgid "_Open..."
+msgstr "_Aç..."
 
-msgid "_Go to Date..."
-msgstr "_Güne Git..."
+#: ui/evolution-message-composer.xml.h:46
+msgid "_Reply-To Field"
+msgstr "_Yanıtla Alanı"
 
-msgid "_Go to Folder..."
-msgstr "Dizine _Git..."
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
 
-msgid "_HTML Signature:"
-msgstr "_HTML İmzası:"
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Öğeyi kaydet ve iletişim penceresini kapat"
 
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Yardım"
 
-msgid "_Hide the Shortcut Bar"
-msgstr "Kısayol Çubuğunu _Gizle"
-
-msgid "_Highlight citations with"
-msgstr "_Referansları "
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "İmza _dosyası:"
 
-msgid "_Host:"
-msgstr "_Makina:"
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr "Bu dizini üye dizinler listesine ekle"
 
-msgid "_Import..."
-msgstr "_Al..."
+#: ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "_Dizin"
 
-msgid "_Insert"
-msgstr "_Ekle"
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List of Folders"
+msgstr "Dizin Listesini Tazele"
 
-msgid "_Invert Selection"
-msgstr "S_eçimi Tersine Çevir"
+#: ui/evolution-subscribe.xml.h:5
+msgid "Remove folder from your list of subscribed folders"
+msgstr "Bu dizini üye diziler listesinden sil"
 
-msgid "_Invite Others..."
-msgstr "_Başkalarını Davet Et..."
+#: ui/evolution-subscribe.xml.h:7
+msgid "Subscribe"
+msgstr "Üye ol"
 
-msgid "_Job title:"
-msgstr "_Meslek tanımı:"
+#: ui/evolution-subscribe.xml.h:8
+msgid "Unsubscribe"
+msgstr "Üyelikten çık"
 
-msgid "_Large Icons"
-msgstr "_Büyük Simgeler"
+#: ui/evolution-task-editor.xml.h:1
+msgid "Assign Task"
+msgstr "Görev Ata"
 
-msgid "_Larger"
-msgstr "_Daha büyük"
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr "Bu görevi diğerlerine ata"
 
-msgid "_Last:"
-msgstr "_Soyadı:"
+#: ui/evolution-task-editor.xml.h:3
+msgid "Cancel Task"
+msgstr "Görevi İptal Et"
 
-msgid "_Load images if sender is in addressbook"
-msgstr "_Gönderici adres defterinde ise resimleri yükle"
+#: ui/evolution-task-editor.xml.h:4
+msgid "Cancel this task"
+msgstr "Bu görevi iptal et"
 
-msgid "_Log filter actions to:"
-msgstr "Filtre eylemlerini buraya kaydet:"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr "Son görev bilgisini al"
 
-msgid "_Mail"
-msgstr "İ_leti"
+#: ui/evolution-task-editor.xml.h:8
+msgid "Re_fresh Task"
+msgstr "Görevi _Tazele"
 
-msgid "_Mail Message"
-msgstr "_İletiyi Gönder"
+#: ui/evolution-tasks.xml.h:3
+msgid "Copy selected task"
+msgstr "Seçili görevi kopyala"
 
-msgid "_Mail Settings..."
-msgstr "İ_leti Ayarları..."
+#: ui/evolution-tasks.xml.h:5
+msgid "Cut selected task"
+msgstr "Seçili Görevi Sil"
 
-msgid "_Manager's Name:"
-msgstr "_Menejerinin adı:"
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Seçilen görevleri sil"
 
-msgid "_Mark Tasks as Complete"
-msgstr "Görevleri _Bitmiş Olarak İşaretle"
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Seçilen görevleri sil"
 
-msgid "_Mark as Complete"
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
 msgstr "_Bitmiş Olarak İşaretle"
 
-msgid "_Mark messages as Read after"
-msgstr "İletileri"
+#: ui/evolution-tasks.xml.h:10
+msgid "Paste task from the clipboard"
+msgstr "Panodan görevi yapıştır"
 
-msgid "_Message Display"
-msgstr "İleti _Görünümü"
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Yazdırılacak olan bağlantıları önizler"
 
-msgid "_Message Recipients:"
-msgstr "_Alıcılar"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Bu iletiyi yazdır"
 
-msgid "_Middle:"
-msgstr "_Ortanca:"
+#: ui/evolution.xml.h:1
+msgid "About Ximian Evolution..."
+msgstr "Ximian Evolution Hakkında..."
 
-msgid "_Modify"
-msgstr "_Düzenle"
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
+msgstr "_Kısayol Çubuğuna Ekle"
 
-msgid "_Mon"
-msgstr "P_zt"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution kabuğu."
 
-msgid "_Move to Folder"
-msgstr "Dizine _Taşı"
+#: ui/evolution.xml.h:4
+msgid "Change the name of this folder"
+msgstr "Bu dizinin adını değiştir"
 
-msgid "_Move to Folder..."
-msgstr "_Dizine Taşı..."
+#: ui/evolution.xml.h:7
+msgid "Copy this folder"
+msgstr "Bu Dizini Kopyala"
 
-msgid "_Move..."
-msgstr "_Taşı..."
+#: ui/evolution.xml.h:8
+msgid "Create _New Folder..."
+msgstr "Yeni Bir _Dizin Yarat..."
 
-msgid "_Name:"
-msgstr "İ_sim:"
+#: ui/evolution.xml.h:9
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Kısayol çubuğunda bu dizine bir bağlantı oluştur"
 
-msgid "_Never load images off the net"
-msgstr "R_esimleri hiç bir zaman ağdan indirme"
+#: ui/evolution.xml.h:10
+msgid "Create a new folder"
+msgstr "Yeni bir dizin yarat"
+
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Yeni bir kısayol yarat"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Yeni bir dizin yarat"
+
+#: ui/evolution.xml.h:13
+msgid "Delete this folder"
+msgstr "Bu dizini sil"
+
+#: ui/evolution.xml.h:14
+msgid "Display a different folder"
+msgstr "Farklı bir dizin göster"
+
+#: ui/evolution.xml.h:15
+msgid "E_xit"
+msgstr "Çı_k"
+
+#: ui/evolution.xml.h:16
+msgid "Evolution _Window"
+msgstr "Evolution _Penceresi"
+
+#: ui/evolution.xml.h:17
+msgid "Exit the program"
+msgstr "Programdan çık"
+
+#: ui/evolution.xml.h:18
+msgid "Import data from other programs"
+msgstr "Diğer programlardan veri al"
+
+#: ui/evolution.xml.h:20
+msgid "Move this folder to another place"
+msgstr "Bu dizini başka bir yere taşı"
+
+#: ui/evolution.xml.h:21
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Yeni Bir _Dizin Yarat..."
+
+#: ui/evolution.xml.h:22
+msgid "Open a folder belonging to some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Yeni Pencerede Aç"
+
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
+msgstr "Bu dizini yeni bir pencerede aç"
+
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Pilot Ayarları..."
+
+#: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "_Pilot Ayarları..."
+
+#: ui/evolution.xml.h:28
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr ""
+
+#: ui/evolution.xml.h:29
+msgid "Send / Receive"
+msgstr "Al / Gönder"
+
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
+
+#: ui/evolution.xml.h:31
+msgid "Set up Pilot conduit configuration"
+msgstr ""
+
+#: ui/evolution.xml.h:32
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "İleti Yapılandırması"
 
+#: ui/evolution.xml.h:33
+msgid "Show information about Ximian Evolution"
+msgstr "Ximian Evolution hakkında bilgi ver"
+
+#: ui/evolution.xml.h:34
+msgid "Submit Bug Report"
+msgstr "Hata Raporu Gönder"
+
+#: ui/evolution.xml.h:35
+msgid "Submit _Bug Report"
+msgstr "_Hata Raporu Gönder"
+
+#: ui/evolution.xml.h:36
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Bug Buddy kullanarak bir hata raporu gönderin"
+
+#: ui/evolution.xml.h:37
+msgid "Toggle"
+msgstr "Aç/kapat"
+
+#: ui/evolution.xml.h:38
+msgid "Toggle whether to show the folder bar"
+msgstr "Dizin çubuğunu göster/gizle"
+
+#: ui/evolution.xml.h:39
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Kısayol çubuğunu göster/gizle"
+
+#: ui/evolution.xml.h:40
+msgid "Toggle whether we are working offline."
+msgstr "Çevrimiçi/çevrimdışı çalış."
+
+#: ui/evolution.xml.h:41
+msgid "View the selected folder"
+msgstr "Seçili dizini göster"
+
+#: ui/evolution.xml.h:43
+msgid "Ximian Evolution _FAQ"
+msgstr "Ximian Evolution _SSS"
+
+#: ui/evolution.xml.h:44
+msgid "_About Ximian Evolution..."
+msgstr "Ximian _Evolution Hakkında..."
+
+#: ui/evolution.xml.h:47
+msgid "_Copy..."
+msgstr "_Kopyala..."
+
+#: ui/evolution.xml.h:51
+msgid "_Folder Bar"
+msgstr "_Dizin Çubuğu"
+
+#: ui/evolution.xml.h:52
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Dizin"
+
+#: ui/evolution.xml.h:53
+msgid "_Go to Folder..."
+msgstr "Dizine _Git..."
+
+#: ui/evolution.xml.h:55
+msgid "_Import..."
+msgstr "_Al..."
+
+#: ui/evolution.xml.h:56
+msgid "_Move..."
+msgstr "_Taşı..."
+
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Yeni"
 
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Yeni Dizin"
 
-msgid "_New Group..."
-msgstr "Yeni _Grup..."
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Remove Other User's Folder"
+msgstr "Dizine _Taşı"
 
-msgid "_News Feeds"
-msgstr "Haber _Grupları"
+#: ui/evolution.xml.h:60
+msgid "_Rename..."
+msgstr "Y_eniden İsimlendir..."
 
-msgid "_Nickname:"
-msgstr "_Lakap:"
+#: ui/evolution.xml.h:61
+msgid "_Send / Receive"
+msgstr "_Gönder / Al"
 
-msgid "_No recurrence"
-msgstr "_Tekrarlama yok"
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "İ_leti Ayarları..."
 
-msgid "_Normal Display"
-msgstr "Normal _Gösterim"
+#: ui/evolution.xml.h:63
+msgid "_Shortcut Bar"
+msgstr "_Kısayol Çubuğu"
 
-msgid "_Office:"
-msgstr "_Ofis:"
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Kısayol"
 
-msgid "_One day"
-msgstr "_Bir gün"
+#: ui/my-evolution.xml.h:3
+msgid "Print summary"
+msgstr "Özeti yazdır"
 
-msgid "_Open"
-msgstr "_Aç"
+#: ui/my-evolution.xml.h:4
+msgid "Reload"
+msgstr "Tekrar yükle"
 
-msgid "_Open Message"
-msgstr "İ_letiyi Aç "
+#: ui/my-evolution.xml.h:5
+msgid "Reload the view"
+msgstr "Görünümü tekrar yükle"
 
-msgid "_Open..."
-msgstr "_Aç..."
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "By _Company"
+msgstr "Şirkete Göre"
 
-msgid "_Options"
-msgstr "_Seçenekler"
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Adres Kartları"
 
-msgid "_Options..."
-msgstr "_Seçenekler..."
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "_Phone List"
+msgstr "Telefon Listesi"
 
-msgid "_Organization:"
-msgstr "_Kurum:"
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Hafta Görünümü"
 
-msgid "_PGP binary path:"
-msgstr "_PGP ikili program yolu:"
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Gün Görünümü"
 
-msgid "_PO Box:"
-msgstr "_Posta Kutusu:"
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Ay Görünümü"
 
-msgid "_Paste"
-msgstr "_Yapıştır"
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Çalışma Haftası Görünümü"
 
-msgid "_Path:"
-msgstr "_Yol:"
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Dizini Seçin"
 
-msgid "_Pilot Settings..."
-msgstr "_Pilot Ayarları..."
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
 
-msgid "_Port:"
-msgstr "_Port:"
+#: views/mail/galview.xml.h:3
+msgid "By Sender"
+msgstr "Gönderene Göre"
 
-msgid "_Preview Pane"
-msgstr "Önizleme _Panosu"
+#: views/mail/galview.xml.h:4
+msgid "By Status"
+msgstr "Duruma Göre"
 
-msgid "_Print"
-msgstr "_Yazdır"
+#: views/mail/galview.xml.h:5
+msgid "By Subject"
+msgstr "Konuya Göre"
 
-msgid "_Print..."
-msgstr "_Yazdır..."
+#: views/mail/galview.xml.h:6
+msgid "Messages"
+msgstr "İletiler"
 
-msgid "_Priority:"
-msgstr "Ö_ncelik:"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
+msgstr "Kategori ile"
 
-msgid "_Properties..."
-msgstr "Ö_zellikler..."
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Görev"
 
-msgid "_Public Calendar URL:"
-msgstr "_Genel Takvim URL:"
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+msgid "UTC"
+msgstr "UTC"
 
-msgid "_Publish Free/Busy Information"
-msgstr "_Boş/Meşgul Bilgisini Yayınla"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Bir Zaman Dilimi Seçin"
 
-msgid "_Remember this password"
-msgstr "_Bu parolayı hatırla"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Seçim:"
 
-msgid "_Remove"
-msgstr "_Sil"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Zaman Dilimleri"
 
-msgid "_Remove this Group..."
-msgstr "B_u Grubu Sil..."
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"Zaman dilimini seçebilmek için farenin sol tuşu ile haritaya yakınlaşın. \n"
+"Haritadan uzaklaşmak için farenin sağ tuşunu kullanın."
 
-msgid "_Rename"
-msgstr "_Yeniden adlandır"
+#: widgets/menus/gal-view-menus.c:295
+msgid "_Current View"
+msgstr "Ş_imdiki Görünüm"
 
-msgid "_Rename..."
-msgstr "Y_eniden İsimlendir..."
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:357
+#, fuzzy
+msgid "Custom View"
+msgstr "Ş_imdiki Görünüm"
 
-msgid "_Reply to Sender"
-msgstr "_Gönderene Cevapla"
+#: widgets/menus/gal-view-menus.c:366
+msgid "Save Custom View"
+msgstr ""
 
-msgid "_Reply-To Field"
-msgstr "_Yanıtla Alanı"
+#: widgets/menus/gal-view-menus.c:379
+msgid "Define Views"
+msgstr "Görünümleri Tanımla"
 
-msgid "_Required People"
-msgstr "_Gerekli Kişiler"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:427
+msgid "MTWTFSS"
+msgstr "PSÇPCCP"
 
-msgid "_Sat"
-msgstr "_Cmt"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1070
+msgid "%B %Y"
+msgstr "%B %Y"
 
-msgid "_Save"
-msgstr "_Kaydet"
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+msgid "Now"
+msgstr "Şimdi"
 
-msgid "_Save As..."
-msgstr "_Farklı Kaydet..."
+#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+msgid "Today"
+msgstr "Bugün"
 
-msgid "_Save as VCard"
-msgstr "VCard Olarak Kaydet"
+#: widgets/misc/e-cell-date-edit.c:797
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Gün %s biçiminde girilmelidir."
 
-msgid "_Schedule"
-msgstr "_Zamanlama"
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Yüzde değeri 0 ile 100 arasında bulunmalıdır."
 
-msgid "_Search"
-msgstr "_Ara"
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr "Baltık"
 
-msgid "_Search for Contacts"
-msgstr "Bağ_lantıları Ara"
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr "Orta Avrupa"
 
-msgid "_Security"
-msgstr "_Güvenlik"
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr "Çince"
 
-msgid "_Select All"
-msgstr "_Hepsini Seç"
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr "Kiril"
 
-msgid "_Send / Receive"
-msgstr "_Gönder / Al"
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
+msgstr "Yunanca"
 
-msgid "_Send mail in HTML format by default."
-msgstr "İ_letiyi her zaman HTML olarak gönder."
+#: widgets/misc/e-charset-picker.c:64
+msgid "Hebrew"
+msgstr ""
 
-msgid "_Server Type: "
-msgstr "Su_nucu Türü: "
+#: widgets/misc/e-charset-picker.c:65
+msgid "Japanese"
+msgstr "Japonca"
 
-msgid "_Server name:"
-msgstr "_Sunucu adı:"
+#: widgets/misc/e-charset-picker.c:66
+msgid "Korean"
+msgstr "Korece"
 
-msgid "_Shortcut"
-msgstr "_Kısayol"
+#: widgets/misc/e-charset-picker.c:67
+msgid "Turkish"
+msgstr "Türkçe"
 
-msgid "_Shortcut Bar"
-msgstr "_Kısayol Çubuğu"
+#: widgets/misc/e-charset-picker.c:68
+msgid "Unicode"
+msgstr "Unicode"
 
-msgid "_Signature file:"
-msgstr "İmza _dosyası:"
+#: widgets/misc/e-charset-picker.c:69
+msgid "Western European"
+msgstr "Batı Avrupa"
 
-msgid "_Simple recurrence"
-msgstr "_Basit tekrar"
+#: widgets/misc/e-charset-picker.c:86
+msgid "Traditional"
+msgstr "Geleneksel"
 
-msgid "_Small Icons"
-msgstr "_Küçük Simgeler"
+#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+msgid "Simplified"
+msgstr "Basitleştirilmiş"
 
-msgid "_Start time:"
-msgstr "B_aşlangıç tarihi:"
+#: widgets/misc/e-charset-picker.c:92
+msgid "Ukrainian"
+msgstr "Ukraynaca"
 
-msgid "_State/Province:"
-msgstr "_Bölge:"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "Visalia"
 
-msgid "_Status:"
-msgstr "_Durum:"
+#: widgets/misc/e-charset-picker.c:164
+#, c-format
+msgid "Unknown character set: %s"
+msgstr "Bilinmeyen karakter seti: %s"
 
-msgid "_Subscribe"
-msgstr "_Üye ol"
+#: widgets/misc/e-charset-picker.c:206
+msgid "Enter the character set to use"
+msgstr "Kullanılacak karakter setini girin"
 
-msgid "_Subscribe to Folders..."
-msgstr "_Dizinlere Üye Ol..."
+#: widgets/misc/e-charset-picker.c:281
+msgid "Other..."
+msgstr "Diğer..."
 
-msgid "_Suffix:"
-msgstr "S_onek:"
+#: widgets/misc/e-charset-picker.c:400
+msgid "Character Encoding"
+msgstr "Karakter Kodlaması"
 
-msgid "_Summary Settings..."
-msgstr "Ö_zet Ayarları..."
+#: widgets/misc/e-clipped-label.c:111
+msgid "..."
+msgstr "..."
 
-msgid "_Task"
-msgstr "_Görev"
+#: widgets/misc/e-filter-bar.c:189
+msgid "Search Editor"
+msgstr "Arama Düzenleyici"
 
-msgid "_Task List"
-msgstr "_Görev Listesi"
+#: widgets/misc/e-filter-bar.c:211
+msgid "Save Search"
+msgstr "Aramayı Kaydet"
 
-msgid "_Task..."
-msgstr "_Görev..."
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Aramayı Kaydet"
 
-msgid "_Threaded Message List"
-msgstr "_Konumlandırılan İleti Listesi"
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "_Kayıtlı Aramalara Ekle..."
 
-msgid "_Title:"
-msgstr "_Sıfatı:"
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Gelişmiş..."
 
-msgid "_Tools"
-msgstr "_Araçlar"
+#: widgets/misc/e-messagebox.c:152
+msgid "Information"
+msgstr "Bilgi"
 
-msgid "_Undelete"
-msgstr "_Silme"
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Hata"
 
-msgid "_Unsubscribe"
-msgstr "Ü_yelikten çık"
+#: widgets/misc/e-messagebox.c:173
+msgid "Question"
+msgstr "Soru"
 
-msgid "_Update Free/Busy"
-msgstr "_Boş/Meşgul Olanları Güncelle"
+#: widgets/misc/e-messagebox.c:180
+msgid "Message"
+msgstr "İleti"
 
-msgid "_Username:"
-msgstr "_Kullanıcı adı:"
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
+msgid "Don't show this message again."
+msgstr "Bu mesajı bir daha gösterme."
 
-msgid "_View"
-msgstr "_Göster"
+#: widgets/misc/e-search-bar.c:520
+#, fuzzy
+msgid "_Find Now"
+msgstr "Şimdi Bul"
 
-msgid "_Weather"
-msgstr "_Hava Durumu"
+#: widgets/misc/e-search-bar.c:521
+#, fuzzy
+msgid "_Clear"
+msgstr "Temizle"
 
-msgid "_Web page address:"
-msgstr "W_eb sayfası adresi:"
+#: widgets/misc/e-search-bar.c:894
+msgid "Clear"
+msgstr "Temizle"
 
-msgid "_Wed"
-msgstr "Ç_ar"
+#: widgets/misc/e-search-bar.c:896
+msgid "Find Now"
+msgstr "Şimdi Bul"
 
-msgid "_Work Offline"
-msgstr "Çe_vrimdışı Çalış"
+#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
+msgid "The Personal Addressbook Server"
+msgstr "Kişisel Adres Defteri Sunucusu"
 
-msgid "_Work Online"
-msgstr "Ç_evrimiçi Çalış"
+#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr "Kişisel Takvim Sunucusu"
 
-msgid "_ZIP Code:"
-msgstr "Posta _Numarası:"
+#: wombat/wombat.c:199
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "setup_vfs(): GNOME-VFS başlatılamadı"
 
-msgid "_every"
-msgstr "_her"
+#: wombat/wombat.c:211
+msgid "init_corba(): could not initialize GNOME"
+msgstr "init_corba(): GNOME başlatılamadı"
 
-msgid "`%s' is not a directory."
-msgstr "`%s' bir dizin değil."
+#: wombat/wombat.c:224
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "init_bonobo(): Bonobo başlatılamadı"
 
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' bir maildir dizini."
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ek: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ülke:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Aile:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  İsim:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Posta Kutusu:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Önek:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Sonek:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Adres:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Doğum Günü: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kategoriler: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Açıklama: "
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-posta:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "İsim:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Genel Anahtar: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefonlar:\n"
+
+#~ msgid " (default)"
+#~ msgstr " (öntanımlı)"
+
+#~ msgid " _Refresh List "
+#~ msgstr "_Listeyi Tazele "
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Gelen"
 
-msgid "`%s' is not a regular file."
-msgstr "`%s' normal bir dosya değildir."
+#~ msgid "%u bytes"
+#~ msgstr "%u bayt"
 
-msgid "a time relative to the current time"
-msgstr "şimdiki zamana göreceli bir zaman"
+#~ msgid "(No name)"
+#~ msgstr "(simsiz)"
 
-msgid "address card"
-msgstr "adres kartı"
+#~ msgid "(Unknown)"
+#~ msgstr "(Bilinmiyor)"
 
-msgid "after"
-msgstr "sonra"
+#~ msgid "(unknown host)"
+#~ msgstr "(Bilinmeyen makine)"
 
-msgid "am"
-msgstr "öö"
+#~ msgid "1 byte"
+#~ msgstr "1 bayt"
 
-msgid "an unknown sender"
-msgstr "bilinmeyen gönderici"
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ msgstr "<dd><b>Hava durumu sunucusuna bağlantı kurulamadı</b></dd>"
 
-msgid "and %d other cards."
-msgstr "ve %d adet diğer kart."
+#~ msgid "Account Name"
+#~ msgstr "Hesap Adı:"
 
-msgid "and one other card."
-msgstr "ve diğer 1 kart."
+#~ msgid "Add Addressbook"
+#~ msgstr "Adres Defterine Ekle"
 
-msgid "attachment"
-msgstr "ek"
+#~ msgid "Advanced"
+#~ msgstr "Gelişmiş"
 
-msgid "before"
-msgstr "önce"
+#~ msgid "Al_l stations:"
+#~ msgstr "Tüm _istasyonlar:"
 
-msgid "calendar information"
-msgstr "takvim bilgisi"
+#~ msgid "All _folders:"
+#~ msgstr "Tüm _dizinler"
 
-msgid "card.vcf"
-msgstr "kart.vcf"
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Gerçekten bu haber grubu hesabını silmek istiyor musunuz?"
 
-msgid "contact-list-editor"
-msgstr "bağlantı-listesi-editörü"
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Gerçekten %d dizinini silmek istiyor musunuz?"
 
-msgid "contains"
-msgstr "içerir"
+#~ msgid "Base"
+#~ msgstr "Ana"
 
-msgid "contains? expects 2 arguments"
-msgstr "contains? iki argüman istiyor"
+#~ msgid "Begins: <b>"
+#~ msgstr "Başlangıç: <b>"
 
-msgid "contains? expects argument 1 to be a string"
-msgstr "contains? birinci argümanı dizgi şeklinde istiyor"
+#~ msgid "C_ontaining:"
+#~ msgstr "İç_eren:"
 
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? ikinci argümanı dizgi şeklinde istiyor"
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "İleti gönderilemiyor: gönderen adresi geçersiz."
 
-msgid "date-end"
-msgstr "bitiş-tarihi"
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Bu ileti imzalanamadı, çünkü parola girilmedi"
 
-msgid "date-start"
-msgstr "başlangıç-tarihi"
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Bu ileti imzalanamadı: İmzalanacak metin yok"
 
-msgid "day"
-msgstr "gün"
+#~ msgid "Card: "
+#~ msgstr "Kart: "
 
-msgid "day(s)"
-msgstr "gün"
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Özet ayarlarını değiştir"
 
-msgid "days"
-msgstr "gün"
+#~ msgid "Composer"
+#~ msgstr "Düzenleyici"
 
-msgid "description"
-msgstr "açıklama"
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Takvim ayarlarını değiştir"
 
-msgid "does not contain"
-msgstr "içermez"
+#~ msgid "Copying"
+#~ msgstr "Kopyalanıyor"
 
-msgid "does not end with"
-msgstr "sonlanmaz"
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Yeni iletileri almak için POP sunucusuna bağlantı kurulamadı: %s"
 
-msgid "does not exist"
-msgstr "bulunmaz"
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "%s sunucusuna bağlantı kurulamadı"
 
-msgid "does not sound like"
-msgstr "benzemez"
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "PGP şifreli içerik oluşturulamıyor."
 
-msgid "does not start with"
-msgstr "başlamaz"
+#~ msgid "Could not create the alarm notify service"
+#~ msgstr "Alarm bilgilendirme servisi oluşturamadım"
 
-msgid "end of appointment"
-msgstr "randevu sonu"
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "İleti alınamadı: %s"
 
-msgid "ends with"
-msgstr "biter"
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "İleti gövdesinde 'Gönderen' adresi bulunamadı"
 
-msgid "exists"
-msgstr "bulunur"
+#~ msgid "Could not get group list from server."
+#~ msgstr "Sunucudan grup listesi alınamadı."
 
-msgid "for"
-msgstr "için"
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Haber grubu sunucusu için dizin açılamadı: %s"
 
-msgid "forever"
-msgstr "daima"
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Y_eni Tüm Gün Olayı Oluştur"
 
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype hiç argüman istemiyor"
+#~ msgid "Create a New _Task"
+#~ msgstr "Yeni _Bir Görev Oluştur"
 
-msgid "hour"
-msgstr "saat"
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Y_eni Bir Randevu Oluştur"
 
-msgid "hour(s)"
-msgstr "saat"
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Tüm gün için bir olay oluştur"
 
-msgid "hours"
-msgstr "saat"
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Aramadan _Sanal Dizin Yarat"
 
-msgid "iCalendar Error"
-msgstr "iCalendar Hatası"
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "DATA isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
 
-msgid "iCalendar Information"
-msgstr "iCalendar Bilgisi"
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "DATA gönderimi zaman aşımına uğradı: %s: ileti gönderilmedi"
 
-msgid "if all criteria are met"
-msgstr "tüm kriterler sağlanırsa"
+#~ msgid "Default Forward style is: "
+#~ msgstr "Öntanımlı _Yönlendirme biçemi: "
 
-msgid "if any criteria are met"
-msgstr "herhangi bir kriter sağlanırsa"
+#~ msgid "Edit Addressbook"
+#~ msgstr "Adres Defterini Düzenle"
 
-msgid "inHg"
-msgstr "inHg"
+#~ msgid "Edit..."
+#~ msgstr "Düzenle..."
 
-msgid "incoming"
-msgstr "gelen"
+#~ msgid "Email is"
+#~ msgstr "E-posta adresi"
 
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Bonobo başlatılamadı"
+#~ msgid "Error in search expression."
+#~ msgstr "Arama ifadesinde hata."
 
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): GNOME başlatılamadı"
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Yeni bir dizin yarat"
 
-msgid "invalid time"
-msgstr "geçersiz saat"
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolution Aktarma Yardımcısı"
 
-msgid "is greater than"
-msgstr "büyük"
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution Haber Grubu Düzenleyici"
 
-msgid "is less than"
-msgstr "küçük"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution takvim özet bileşeni."
 
-msgid "is not"
-msgstr "değil"
+#~ msgid "Filter on Mailing List"
+#~ msgstr "E-posta Listesine Göre Filtrele"
 
-msgid "kilometers"
-msgstr "kilometre"
+#~ msgid "Forward _Attached"
+#~ msgstr "_Ekli Yönlendir"
 
-msgid "knots"
-msgstr "knot"
+#~ msgid "Forward _Inline"
+#~ msgstr "İçinde _Yönlendir"
 
-msgid "kph"
-msgstr "km/h"
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Boş/Meşgul bilgi başlangıcı: <b>"
 
-msgid "list"
-msgstr "liste"
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Boş/Meşgul bilgi bitişi: <b>"
 
-msgid "maildir"
-msgstr "pdizini"
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML imza dosyası:"
 
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "make-time 1. argümanı ISO 8601 tarih/saat bilgisi olmalıdır"
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "%s alınıyor\n"
+#~ "(Hazır değil).\n"
+#~ "5 saniye içinde yeniden denenecek."
 
-msgid "make-time expects 1 argument"
-msgstr "make-time 1 argüman istiyor"
+#~ msgid "Indexing:"
+#~ msgstr "İndeksleniyor:"
 
-msgid "make-time expects argument 1 to be a string"
-msgstr "make-time için birinci argüman bir dizi olmalıdır."
+#~ msgid "Insert File"
+#~ msgstr "Dosya İçer"
 
-msgid "mbox"
-msgstr "pkutusu"
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "İletiye bir metin dosyası ekle"
 
-msgid "mh"
-msgstr "mh"
+#~ msgid "Insert text file..."
+#~ msgstr "Metin dosyası yerleştir..."
 
-msgid "miles"
-msgstr "mil"
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "İleti depolama dizini (iç kullanım)"
 
-msgid "minute"
-msgstr "dakika"
+#~ msgid "Mailbox Format"
+#~ msgstr "Posta Kutusu Biçimi"
 
-msgid "minute(s)"
-msgstr "dakika"
+#~ msgid "Mark as Unim_portant"
+#~ msgstr "Ön_emsiz Olarak İşaretle"
 
-msgid "minutes"
-msgstr "dakika"
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Toplantı başlangıcı: <b>"
 
-msgid "mmHg"
-msgstr "mmHg"
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Toplantı bitişi: <b>"
 
-msgid "month"
-msgstr "ay"
+#~ msgid "Message %s not found."
+#~ msgstr "%s numaralı ileti bulunamadı."
 
-msgid "month(s)"
-msgstr "ay"
+#~ msgid "Message was received"
+#~ msgstr "İleti alındı"
 
-msgid "months"
-msgstr "ay"
+#~ msgid "Message was sent"
+#~ msgstr "İleti gönderildi"
 
-msgid "newswindow1"
-msgstr "habergrubupenceresi1"
+#~ msgid "Moving"
+#~ msgstr "Taşınıyor"
 
-msgid "not a maildir directory"
-msgstr "maildir dizini değil"
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP _Sunucusu:"
 
-msgid "now"
-msgstr "şimdi"
+#~ msgid "NT Login"
+#~ msgstr "NT Girişi"
 
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "ocrur-in-time-range? iki argüman istiyor"
+#~ msgid "New Contact _List"
+#~ msgstr "Yeni Bağlantı _Listesi"
 
-msgid "occurrences"
-msgstr "tekrarlar"
+#~ msgid "New List"
+#~ msgstr "Yeni Liste"
 
-msgid "on"
-msgstr "tarih"
+#~ msgid "New _Contact"
+#~ msgstr "Yeni _Bağlantı"
 
-msgid "on the"
-msgstr " "
+#~ msgid "New _Mail Message"
+#~ msgstr "_Yeni İleti"
 
-msgid "outgoing"
-msgstr "giden"
+#~ msgid "New _Task"
+#~ msgstr "Yeni _Görev"
 
-msgid "placeholder"
-msgstr "ayraç"
+#~ msgid "News"
+#~ msgstr "Haberler"
 
-msgid "pm"
-msgstr "ös"
+#~ msgid "No such message: %s"
+#~ msgstr "Böyle bir ileti yok: %s"
 
-msgid "second"
-msgstr "ikinci"
+#~ msgid "Non-Participants"
+#~ msgstr "Katılmayanlar"
 
-msgid "seconds"
-msgstr "saniye"
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Lütfen %s parolanızı girin"
 
-msgid "seconds."
-msgstr "saniye sonra okunmuş işaretle"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Lütfen parolanızı girin: "
 
-msgid "sendmail"
-msgstr "sendmail"
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "RCPT TO zaman aşımı: %s: ileti gönderilmedi"
 
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail %s sinyali ile kapandı: ileti gönderilemedi."
+#~ msgid "Regions"
+#~ msgstr "Bölgeler"
 
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail %d durumu ile çıktı: ileti gönderilemedi."
+#~ msgid "Restarting search."
+#~ msgstr "Arama yeniden başlatılıyor."
 
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): GNOME-VFS başlatılamadı"
+#~ msgid "Riga"
+#~ msgstr "Rivas"
 
-msgid "sounds like"
-msgstr "benzer"
+#~ msgid "Save to Disk..."
+#~ msgstr "Diske Kaydet..."
 
-msgid "specific folders only"
-msgstr "sadece belirtilen dizinler"
+#~ msgid "Sear_ch"
+#~ msgstr "_Ara"
 
-msgid "start of appointment"
-msgstr "randevu başlangıcı"
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Filtre Günlük Dosyasını Seçin..."
 
-msgid "starts with"
-msgstr "başlayan"
+#~ msgid "Send _Later"
+#~ msgstr "_Sonra Gönder"
 
-msgid "th"
-msgstr "."
+#~ msgid "Send _later"
+#~ msgstr "_Sonra gönder"
 
-msgid "the current time"
-msgstr "şimdiki zaman"
+#~ msgid "Send the message later"
+#~ msgstr "Bu iletiyi sonra gönder"
 
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day 2 argüman istiyor"
+#~ msgid "Show All"
+#~ msgstr "Hepsini Göster"
 
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr "time-add-day 2. argümanı bir sayı istiyor"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Aşağıdaki sınıflandırmalara uyan bağlantıları göster:"
 
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin bir argüman istiyor"
+#~ msgid "Source"
+#~ msgstr "Kaynak"
 
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "time-day-begin birinci argümanı time_t biçiminde istiyor"
+#~ msgid "Sources"
+#~ msgstr "Kaynaklar"
 
-msgid "time-day-end expects 1 argument"
-msgstr "time-day-end bir argüman istiyor"
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Tamamlanan Görev: <b>"
 
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
+#~ msgid "Tasks Settings..."
+#~ msgstr "Görev Ayarları..."
 
-msgid "time-now expects 0 arguments"
-msgstr "time-now hiç argüman istemiyor"
+#~ msgid "This message contains invalid recipients:"
+#~ msgstr "Bu ileti geçersiz alıcılar içeriyor:"
 
-msgid "until"
-msgstr "tarihe kadar"
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "%s için .newsrc dosyası oluşturulamadı: %s"
 
-msgid "vFolder Sources"
-msgstr "vFolder Kaynakları"
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "LDAP sunucuyla bağlantı bekleniyor..."
 
-msgid "vFolders"
-msgstr "vDizinler"
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Bir dizin seçmeyi unuttunuz.\n"
+#~ "Lütfen geriye gidip geçerli bir dizin seçin."
 
-msgid "week"
-msgstr "hafta"
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Geçersiz bir tarih seçtiniz."
 
-msgid "week(s)"
-msgstr "hafta"
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "İleti göndermeden önce kendinize ait bir kimlik oluşturmalısınız."
 
-msgid "weeks"
-msgstr "hafta"
+#~ msgid "_Apply Filters"
+#~ msgstr "_Filtreleri Uygula"
 
-msgid "with all active remote folders"
-msgstr "tüm etkin uzak dizinlerle birlikte"
+#~ msgid "_Appointment..."
+#~ msgstr "_Randevu..."
 
-msgid "with all local and active remote folders"
-msgstr "tüm yerel ve etkin uzak dizinlerle birlikte"
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Takvim Ayarları..."
 
-msgid "with all local folders"
-msgstr "tüm yerel dizinlerle birlikte"
+#~ msgid "_Delete this Appointment"
+#~ msgstr "Bu _Randevuyu Sil"
 
-msgid "year"
-msgstr "yılda bir güncelle"
+#~ msgid "_Delete this Task"
+#~ msgstr "B_u Görevi Sil"
 
-msgid "year(s)"
-msgstr "yıl"
+#~ msgid "_Display folders:"
+#~ msgstr "_Dizinleri görüntüle:"
 
-msgid "years"
-msgstr "yılda bir güncelle"
+#~ msgid "_Display stations:"
+#~ msgstr "İstasyonları _görüntüle:"
+
+#~ msgid "_Displayed feeds:"
+#~ msgstr "_Görüntülenecek servisler:"
+
+#~ msgid "_End of day:"
+#~ msgstr "_Gün bitimi:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Filtre eylemlerini buraya kaydet:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "_Alıcılar"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Kurum:"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "İ_letiyi her zaman HTML olarak gönder."
+
+#~ msgid "_Server Type: "
+#~ msgstr "Su_nucu Türü: "
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Ö_zet Ayarları..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Görev..."
+
+#~ msgid "newswindow1"
+#~ msgstr "habergrubupenceresi1"
+
+#~ msgid "placeholder"
+#~ msgstr "ayraç"
+
+#~ msgid "seconds."
+#~ msgstr "saniye sonra okunmuş işaretle"
diff --git a/po/uk.po b/po/uk.po
index d04858d0dc..f44b02a2f3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.5\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-04 16:55+0200\n"
 "Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -318,11 +318,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 "Декілька VCard"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "vCard для %s"
@@ -333,47 +339,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 "З'єднання з сервером..."
 
-#: 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 "Помилка видалення картки"
@@ -392,13 +398,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"
@@ -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 "Контакти"
@@ -485,27 +491,37 @@ 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
 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 "Створити новий контактний список"
 
@@ -552,7 +568,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(у цій версії Evolution SSL не підтримується)"
 
 #: 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"
 
@@ -560,11 +576,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."
@@ -572,7 +588,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"
@@ -582,7 +598,7 @@ msgstr ""
 "Не вдається відкрити книгу адрес. Це означає що, або ви\n"
 "дали невірний URI, або не працює LDAP сервер"
 
-#: 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"
@@ -594,7 +610,7 @@ msgstr ""
 "встановити LDAP з вказаного нижче посилання, а потім\n"
 "скомпілювати версію Evolution з CVS.\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"
@@ -604,37 +620,50 @@ msgstr ""
 "Не вдається відкрити книгу адрес. Це означає що, або ви\n"
 "дали невірний URI, або не працює LDAP сервер"
 
-#: 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
 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"
@@ -642,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"
@@ -650,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 "Будь-яка категорія"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "URI теки, що буде відображено переглядачем"
 
@@ -735,50 +764,51 @@ 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
-msgid "&lt;- _Remove"
-msgstr "&lt;- _Видалити"
-
-#: 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 "Видалити"
+
+#: 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 ""
@@ -913,48 +943,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"
@@ -965,7 +1001,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"
@@ -974,47 +1010,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 "Під"
 
-#: 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"
@@ -1022,7 +1058,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"
@@ -1031,7 +1067,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"
@@ -1039,7 +1075,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"
@@ -1049,7 +1085,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"
@@ -1059,20 +1095,20 @@ 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 "
@@ -1082,7 +1118,7 @@ msgstr ""
 "оберете тут \"Ел.адреса\" ви мусите мати анонімний доступ до вашого серверу "
 "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 "
@@ -1092,7 +1128,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"
@@ -1100,11 +1136,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"
@@ -1113,26 +1149,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 "Виокремлене ім'я (DN)"
 
-#: 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
@@ -1140,49 +1176,50 @@ msgstr ""
 msgid "_Add"
 msgstr "Додати"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
-msgstr "_Додати -&gt;"
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+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
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Виокремлене ім'я (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
 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
@@ -1192,102 +1229,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 "Ознака _LDAP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr "Ознаки _LDAP:"
 
-#: 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 "Пошук"
@@ -1302,8 +1339,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"
@@ -1334,11 +1371,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 "Відправник містить"
@@ -1412,7 +1449,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 "Подробиці"
 
@@ -1471,13 +1508,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 "Стерти"
 
@@ -1505,1029 +1542,1029 @@ msgstr "URL публічного календаря:"
 msgid "_Web page address:"
 msgstr "Адреса сторінки WWW:"
 
-#: 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
 #, 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
 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
 #, 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
 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
 #, 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
 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
 #, 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 "Зімбабве"
 
@@ -2564,20 +2601,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 "Е-пошта"
 
@@ -2599,6 +2636,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:"
@@ -2730,7 +2780,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"
 
@@ -2780,7 +2830,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 "Удосконалений пошук"
 
@@ -2789,24 +2839,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 "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
 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"
@@ -2818,10 +2868,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 "Невідома помилка"
 
@@ -2829,7 +2879,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 "Доступ заборонено"
@@ -2850,8 +2900,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 "Скасовано"
 
@@ -2902,7 +2952,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 "Помилка видалення картки"
 
@@ -2919,9 +2969,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
@@ -3011,7 +3060,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"
@@ -3097,7 +3146,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
@@ -3105,8 +3154,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 "Поточний рік"
@@ -3115,7 +3164,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,А,Б,В,Г,Д,Е,Ж,З,І,И,К,Л,М,Н,О,П,Р,С,Т,У,Ф,Х,Ц,Ч,Ш,Щ,Є,Ю,Я"
 
@@ -3123,11 +3172,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"
@@ -3265,7 +3314,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 "Альбомна"
 
@@ -3290,7 +3339,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 "Орієнтація"
 
@@ -3313,7 +3362,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 "Портретна"
 
@@ -3375,20 +3424,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 "Низький"
 
@@ -3399,13 +3448,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 "Не вдалося зчитати програмний блок календаря з Пілота"
 
@@ -3515,11 +3568,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"
@@ -3531,13 +3584,13 @@ msgstr ""
 "Замість цього 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 "
@@ -3554,16 +3607,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 "Не вдалося створити фабрику послуги сповіщення"
 
@@ -3612,7 +3665,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 "Неможливо створити вікно календарю. Перевірте параметри ORBit та OAF. "
@@ -3689,9 +3742,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 +3761,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 +3787,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,29 +3925,30 @@ 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 ""
+"Це нагадування по ел.пошті, але 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 ""
-"Це нагадування по ел.пошті, але Evolution поки що не підтримує такий тип "
-"нагадування. Ви не зможете редагувати параметри цього нагадування."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "З цими аргументами:"
@@ -3898,110 +3972,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 "Відіслати пошту"
 
-#: 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 для невідомого типу перемикача"
@@ -4022,7 +4096,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 "Зведення:"
 
@@ -4105,7 +4179,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 "П'ятниця"
 
@@ -4118,7 +4192,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 "Понеділок"
 
@@ -4128,7 +4202,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 "Субота"
 
@@ -4141,7 +4215,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 "Неділя"
 
@@ -4160,7 +4234,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 "Четвер"
 
@@ -4177,7 +4251,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 "Вівторок"
 
@@ -4186,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 "Середа"
 
@@ -4410,8 +4484,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 "Зберегти як..."
 
@@ -4480,27 +4554,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 "Засідання"
 
@@ -4569,19 +4643,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 +4695,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 "Зацікавлена персона"
@@ -4633,7 +4707,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 "Стан"
@@ -4710,48 +4784,48 @@ 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 "випадки"
 
@@ -4845,7 +4919,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 "Необхідна дія"
 
@@ -4854,7 +4928,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:"
 
@@ -4866,17 +4940,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:"
@@ -4946,12 +5020,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 "Відкрити"
@@ -4961,30 +5035,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"
@@ -5013,12 +5087,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 "Клацніть щоб додати завдання"
@@ -5027,8 +5101,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 "Виконано"
 
@@ -5057,7 +5131,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 "Зведення"
@@ -5124,122 +5198,122 @@ 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 "Конфігурація"
 
-#: 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"
 
-#: 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."
@@ -5247,324 +5321,330 @@ 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
 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 "<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 "Неможливо оновити стан учасника, бо поточний стан невірний!\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 "Вибір теки"
@@ -5610,7 +5690,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 "Потрібні учасники"
 
@@ -5624,52 +5704,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 "Доручено"
 
@@ -5759,43 +5839,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 "Нова зустріч..."
 
@@ -5809,7 +5896,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"
@@ -5817,7 +5910,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"
@@ -5825,12 +5918,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"
@@ -5891,47 +5984,57 @@ 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
 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
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Інформація про зайнятість"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "Календарна інформація"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Ви маєте бути відвідувачем події."
 
@@ -6167,7 +6270,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 "Перегляд друку"
@@ -6191,7 +6294,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 "
@@ -6204,12 +6307,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 "Надрукувати картки"
@@ -6283,17 +6386,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 "Нагадування"
 
-#: 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"
@@ -6302,84 +6405,84 @@ 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 не передбачає аргументів"
 
-#: 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 "перший аргумент make-time повинен бути датою у форматі ISO 8601"
 
-#: 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 "time-add-day очікує, що 1 аргумент буде типу 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 очікує, що 2 аргумент буде числом"
 
-#: 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 "time-day-begin очікує, що 1 аргумент буде типу time_t"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end очікує 1 аргумент"
 
-#: 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 очікує, що 1 аргумент буде типу time_t"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype не очікує аргументів"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? очікує 2 аргументи"
 
-#: 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? очікує, що 1 аргумент буде типу 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? очікує, що 2 аргумент буде типу time_t"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? очікує 2 аргументи"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? очікує, що 1 аргумент буде символьного типу"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? очікує, що 2 аргумент буде символьного типу"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6387,11 +6490,11 @@ msgstr ""
 "contains? очікує, що 1 аргумент буде одним з \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? очікує принаймні 1 аргумент"
 
-#: 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)"
@@ -6399,22 +6502,27 @@ msgstr ""
 "has-categories? очікує, що усі аргументи будуть символьного типу, або єдиний "
 "аргумент логічного типу - хибність (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? не очікує аргументів"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? очікує 1 аргумент"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? очікує, що 1 аргумент буде типу 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 "Виконання пошуку не дало логічного значення"
 
+#: 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.
@@ -8010,82 +8118,82 @@ msgstr "Збереження теки \"%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 "Синхронізація тек"
 
-#: 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"
@@ -8133,11 +8241,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"
@@ -8456,7 +8564,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 "Невірна автенфікація від сервера."
 
@@ -8513,52 +8621,52 @@ msgstr "POP до SMTP авторизація, використовуючи не
 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: причина невідома"
@@ -8757,7 +8865,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"
@@ -8766,11 +8874,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 ""
 
@@ -8792,7 +8900,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"
@@ -8847,68 +8955,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
@@ -8924,28 +9040,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."
 
@@ -8962,6 +9074,11 @@ msgstr "Не вдалося відкрити каталог кешу: %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 "Перевіряти нову пошту"
@@ -9009,77 +9126,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
 #, c-format
 msgid "IMAP server %s"
 msgstr "Сервер IMAP %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"
@@ -9090,24 +9202,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 "Батьківська тека не дозволяє розміщувати підтеки"
 
@@ -9186,8 +9298,8 @@ msgstr ""
 "файлах 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 "Корінь сховища %s не є абсолютним шляхом"
@@ -9199,7 +9311,7 @@ msgstr "Сховище %s не є каталог"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
@@ -9213,32 +9325,32 @@ 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 "Неможливо додати повідомлення до зведення: причина невідома"
 
@@ -9258,6 +9370,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"
@@ -9269,12 +9382,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"
@@ -9300,7 +9415,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"
@@ -9330,7 +9446,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"
@@ -9499,40 +9615,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 "Накопичувальні теки не можна перейменовувати"
 
-#: 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 не є каталог"
 
-#: 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 "Накопичувальній файл пошти %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 "Накопичувальні теки не можна перейменовувати"
 
-#: 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 "Накопичувальні теки не можна видаляти"
 
@@ -9626,50 +9747,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 "Невідомі опади"
@@ -9945,45 +10066,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 "Затримка відповіді на RSET: %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"
@@ -9994,90 +10115,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 "Затримка відповіді на 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 "Перевищено час очікування відповіді на 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 "Затримка відповіді на 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: пошту не відіслано"
@@ -10085,81 +10206,72 @@ 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 "Перевищено час очікування відповіді на 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 "%.1fК"
 
-#: 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М"
 
-#: 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Г"
 
 #. 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 "Долучити файл до повідомлення"
 
@@ -10191,7 +10303,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 "Клацніть тут щоб викликати адресну книгу"
 
@@ -10202,45 +10314,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."
@@ -10251,12 +10363,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 "Без опису"
@@ -10271,7 +10383,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"
@@ -10280,34 +10392,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"
@@ -10316,7 +10428,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"
@@ -10325,7 +10437,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"
@@ -10334,7 +10446,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?"
@@ -10342,28 +10454,39 @@ 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."
@@ -10371,7 +10494,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."
@@ -10379,7 +10513,7 @@ msgstr ""
 "Не вдалося створити вікно редактора:\n"
 "Неможливо активувати компонент 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.)"
@@ -10388,7 +10522,7 @@ msgstr ""
 "<b>(Редактор містить не текстове тіло повідомлення яке неможливо "
 "відредагувати.)<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."
@@ -10396,8 +10530,9 @@ 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 "Не вдалося ініціалізувати редактора Evolutuion."
 
 #: data/evolution.desktop.in.h:1
@@ -10448,8 +10583,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?"
@@ -10598,7 +10733,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
@@ -10653,15 +10789,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 "Вибір теки"
 
@@ -10674,7 +10807,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 "Важливо"
@@ -10861,226 +10994,230 @@ 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
 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
-msgid "returns"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
 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: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
+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 "Правила"
@@ -11114,31 +11251,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 "Пошта"
 
@@ -11199,39 +11336,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?"
@@ -11348,104 +11485,115 @@ 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."
 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 "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Не вдалося ініціалізувати поштовий компонент налаштування Evolutuion."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Не вдалося ініціалізувати компонент інформації про теку Evolutuion."
 
-#: 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"
@@ -11490,140 +11638,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)"
@@ -11696,20 +11844,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 "Неможна створювати два облікових рахунки з спільним ім'ям."
 
@@ -11726,14 +11874,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 "Увімкнути"
 
@@ -11822,9 +11970,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"
@@ -11868,7 +12017,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?"
@@ -11876,28 +12025,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."
@@ -11905,7 +12054,7 @@ msgstr ""
 "Ви можете лише редагувати збережені\n"
 "повідомлення в теці \"Чернетки\"."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11913,39 +12062,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"
@@ -11957,7 +12106,7 @@ msgstr ""
 "\n"
 "Дійсно стерти ці повідомлення?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11966,64 +12115,64 @@ 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 "Підпис HTML:"
@@ -12084,16 +12233,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 "З'єднання з сервером..."
 
@@ -12810,78 +12959,74 @@ msgstr "Неможливо створити контекст конверту S/
 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 "Зберегти зображення як..."
 
@@ -12890,112 +13035,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 "Частину external-body сформовано невірно."
 
-#: 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"
@@ -13004,27 +13150,22 @@ msgstr ""
 "Неможливо зберегти метаінформацію теки; можливо ви не зможете\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: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Не вдалось стерти метаінформацію теки %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."
@@ -13032,15 +13173,15 @@ msgstr ""
 "Якщо ви неспроможні відкрити цю поштову скриньку,\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 ""
@@ -13281,22 +13422,22 @@ msgstr "Очікування..."
 msgid "User canceled operation."
 msgstr "Користувач скасував операцію."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 #, fuzzy
 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 "Ввід пароля"
 
@@ -13305,11 +13446,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"
@@ -13319,11 +13460,11 @@ msgstr ""
 "\n"
 "Бажаєте зберегти зміни?"
 
-#: 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 "Ім'я:"
 
@@ -13363,7 +13504,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 "Вірт.теки"
 
@@ -13393,67 +13534,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 "Сьогодні %I:%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 %I:%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 "Створення списку повідомлень"
 
@@ -13527,45 +13668,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 "Будь ласка, виберіть сервер."
 
@@ -23660,12 +23827,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 "Локальні теки"
 
@@ -23675,23 +23842,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 "Слово дня на 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 джерела новин, який бажаєте додати"
 
@@ -23729,11 +23896,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 "Погода"
 
@@ -25058,6 +25225,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
 msgid "Add a Folder"
 msgstr "Додати теку"
@@ -25293,12 +25465,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"
@@ -25307,12 +25492,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 "Новий..."
 
@@ -25341,20 +25526,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"
@@ -25363,22 +25535,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"
@@ -25387,11 +25559,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"
@@ -25400,17 +25572,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"
@@ -25419,31 +25591,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"
@@ -25451,24 +25623,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 "Імпорт"
 
@@ -25495,30 +25667,30 @@ msgstr "Синхронізація теки"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Параметри Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 msgid "Opening Folder"
 msgstr "Відкривання теки"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, 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
 #, 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 ""
@@ -25561,44 +25733,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 "Про 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 "Робота не на лінії"
 
@@ -25606,27 +25778,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 ""
@@ -25645,12 +25817,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"
@@ -25661,19 +25833,19 @@ msgstr ""
 "несподівано завершився. Щоб знову отримати доступ до нього вам потрібно\n"
 "закрити та перезавантажити Evolution."
 
-#: 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 "Загальна помилка"
 
@@ -25812,58 +25984,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 (...)"
@@ -26080,9 +26256,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 ""
@@ -26099,26 +26276,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"
@@ -26334,10 +26507,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 "Дії"
 
@@ -26456,7 +26629,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 "Зберегти"
 
@@ -26483,7 +26656,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 "Файл"
 
@@ -26565,7 +26738,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
@@ -26615,29 +26789,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 "панель перегляду"
 
-#: 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 "Змінити властивості цієї теки"
@@ -26732,7 +26907,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 "Тека"
 
@@ -27049,7 +27224,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
@@ -27163,7 +27339,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 "Інструменти"
 
@@ -27178,12 +27354,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 "Вид"
 
@@ -27357,7 +27533,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 "Довідка"
 
@@ -27526,7 +27702,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
@@ -27543,113 +27719,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 "Часті запитання щодо Ximian 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
-msgid "_Preferences..."
-msgstr "_Вподобання..."
+#: ui/evolution.xml.h:59
+#, fuzzy
+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 "Ярлик"
@@ -27891,11 +28088,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 "Зберегти пошук"
 
@@ -27974,6 +28171,50 @@ msgstr "init_corba(): не вдалось ініціалізувати GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 
+#~ msgid "&lt;- _Remove"
+#~ msgstr "&lt;- _Видалити"
+
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Додати -&gt;"
+
+#~ 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"
+
+#~ msgid "_Preferences..."
+#~ msgstr "_Вподобання..."
+
 #~ msgid "Error in search expression."
 #~ msgstr "Помилка у регулярному виразі."
 
@@ -27987,14 +28228,6 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 #~ msgid "Email is"
 #~ msgstr "Ел.адреса"
 
-#, fuzzy
-#~ msgid "<- _Remove"
-#~ msgstr "Видалити"
-
-#, fuzzy
-#~ msgid "_Add ->"
-#~ msgstr "Додати"
-
 #~ msgid "Could not create the alarm notify service"
 #~ msgstr "Не вдалося створити послугу сповіщення"
 
@@ -28025,15 +28258,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 " (типово) "
diff --git a/po/vi.po b/po/vi.po
index fcaa7ca5e3..6d8a799942 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2002-09-20 01:34+0200\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-09-21 14:38+0700\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -323,11 +323,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Danh sách vô danh"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Nhiều VCard"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard cho %s"
@@ -338,46 +338,46 @@ msgstr "VCard cho %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 "Không thể khởi động 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 "Đang tìm..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Đang nạp..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 msgid "Reconnecting to LDAP server..."
 msgstr "Đang kết nối tới 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 "Đang thêm card vào 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 "Đang loại bỏ card khỏi 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 "Đang sửa card trong LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Đang nhận kết quả tìm kiếm LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr "Lỗi khi tìm kiếm"
 
@@ -394,13 +394,13 @@ msgid "EBook not loaded\n"
 msgstr "Không nạp được EBook\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "Không thể khởi động wombat server"
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Không thể khởi động wombat"
@@ -467,10 +467,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Factory Điều khiển sổ địa chỉ mẫu"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:609
+#: 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 "Liên lạc"
@@ -487,27 +487,37 @@ msgstr "LDAP Server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP server chứa thông tin liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Liên lạc"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Thư mục chứa thông tin liên lạc"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:566
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Create a new contact"
 msgstr "Tạo liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:569
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Danh sách liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:569
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "_Danh sách liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:570
+#: addressbook/gui/component/addressbook-component.c:572
 msgid "Create a new contact list"
 msgstr "Tạo danh sách liên lạc mới"
 
@@ -544,7 +554,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "LDAP không được bật trong phiên bản Evolution đang dùng"
 
 #: 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 "Không thể khởi động gnome-vfs"
 
@@ -1321,8 +1331,8 @@ msgstr "Factory cho giao diện chọn tên sổ địa chỉ"
 
 #. 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"
@@ -1353,11 +1363,11 @@ msgstr "(%d không hiện)"
 msgid "Unnamed Contact"
 msgstr "Liên lạc vô danh"
 
-#: 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 "Chọn liên lạc từ sổ địa chỉ"
 
-#: 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 "Tìm liên lạc trong"
 
@@ -1430,7 +1440,7 @@ msgid "D_epartment:"
 msgstr "Cơ _quan:"
 
 #: 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 "Chi tiết"
 
@@ -1489,13 +1499,13 @@ msgstr "Muốn nhậm _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/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:3593 filter/filter.glade.h:15
-#: mail/folder-browser.c:1750 mail/mail-config.glade.h:151
+#: 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 "_Xóa"
 
@@ -2610,6 +2620,19 @@ msgstr ""
 "%s đã tồn tại.\n"
 "Bạn có muốn ghi đè lên 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 "Ghi đè tập tin?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Địa chỉ _2:"
@@ -2790,7 +2813,7 @@ msgstr ""
 "Bạn có muốn thêm nữa không?"
 
 #: 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 "Tìm kiếm nâng cao"
 
@@ -2799,24 +2822,24 @@ msgstr "Tìm kiếm nâng cao"
 msgid "Search"
 msgstr "Tìm"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Không có card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 msgid "Error getting book view"
 msgstr "Lỗi dùng book view"
 
-#: 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"
@@ -2830,8 +2853,8 @@ msgstr "Thành công"
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: 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:2137
-#: shell/e-storage.c:518 shell/evolution-shell-component.c:1180
+#: 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 "Lỗi lại"
 
@@ -2839,7 +2862,7 @@ msgstr "Lỗi lại"
 msgid "Repository offline"
 msgstr "Kho ngoại tuyến"
 
-#: 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 "Không đủ quyền truy cập"
@@ -2860,8 +2883,8 @@ msgstr "Chưa hỗ trợ giao thức này"
 #: 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 "Bị hủy bỏ"
 
@@ -2909,7 +2932,7 @@ msgstr "Lỗi khi loại bỏ danh sách"
 
 #: 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 "Lỗi khi loại bỏ card"
 
@@ -2922,11 +2945,10 @@ msgid "Display Cards"
 msgstr "Hiển thị card"
 
 #: 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 ""
 "Bạn yêu cầu rằng %d card là những tấm card. Điều này sẽ mở %d cửa sổ mới để "
 "hiển thị trên màn hình. Bạn có thật sự muốn hiển thị mọi tấm card này không?"
@@ -3014,7 +3036,7 @@ msgstr "Sổ địa chỉ"
 
 #: 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 "Lưu là VCard"
@@ -3091,7 +3113,7 @@ msgstr "Sao chép"
 msgid "Paste"
 msgstr "Dán"
 
-#: 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
@@ -3099,8 +3121,8 @@ msgstr "Dán"
 msgid "Delete"
 msgstr "Xoá"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3557
+#: 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 "Khung xem hiện thời"
 
@@ -3108,7 +3130,7 @@ msgstr "Khung xem hiện thời"
 #. 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"
 
@@ -3116,11 +3138,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"
@@ -3163,7 +3185,10 @@ msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
-msgstr "\n\nKhông có mục nào để xem trong khung nhìn này."
+msgstr ""
+"\n"
+"\n"
+"Không có mục nào để xem trong khung nhìn này."
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
@@ -3252,7 +3277,7 @@ msgid "Include:"
 msgstr "Bao gồm:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Nằm ngang"
 
@@ -3277,7 +3302,7 @@ msgid "Options"
 msgstr "Tùy chọn"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Hướng"
 
@@ -3300,7 +3325,7 @@ msgstr "Nguồn giấy:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Thẳng đứng"
 
@@ -3386,13 +3411,17 @@ msgstr "Thấp"
 msgid "Undefined"
 msgstr "Chưa biết"
 
-#: 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 "Lỗi khi liên lạc với server lịch"
 
-#: 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 "Không thể đọc khối ứng dụng lịch của pilot"
 
@@ -3499,11 +3528,11 @@ msgstr "Thời gian ngủ (phút)"
 msgid "_Edit appointment"
 msgstr "_Sửa cuộc hẹn"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Không có mô tả."
 
-#: 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"
@@ -3515,13 +3544,13 @@ msgstr ""
 "gửi thư. Thay vào đó, Evolution sẽ hiển thị một\n"
 "hộp thoại nhắc nhở thông thường:"
 
-#: calendar/gui/alarm-notify/alarm-queue.c: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 "Cảnh báo"
 
-#: 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 "
@@ -3531,21 +3560,22 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Bộ nhắc lịch Evolution giống như cái cò súng. Bộ nhắc này được cấu hình để chạy chương trình sau:\n"
+"Bộ nhắc lịch Evolution giống như cái cò súng. Bộ nhắc này được cấu hình để "
+"chạy chương trình sau:\n"
 "\n"
 "\t%s\n"
 "\n"
 "Bạn có chắc muốn chạy chương trình này không?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 msgid "Do not ask me about this program again."
 msgstr "Đừng hỏi tôi về chương trình này lần nữa."
 
-#: 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 "Không thể khởi động 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 "Không thể tạo factory Dịch vụ thông báo"
 
@@ -3594,7 +3624,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 ""
@@ -3672,9 +3702,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:1712 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
@@ -3691,13 +3721,13 @@ msgid "Assigned"
 msgstr "Đã gán"
 
 #: 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 "Có"
 
 #: 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 "Không"
 
@@ -3717,74 +3747,94 @@ msgstr "Khung tuần"
 msgid "Month View"
 msgstr "Khung tháng"
 
-#: 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 "Lịch"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Thư mục chứa các cuộc hẹn và sự kiện"
 
-#: 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 Lịch _công cộng:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Thư mục chứa các cuộc hẹn và sự kiện"
+
+#: 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 "Công việc"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Thư mục chứa các mục to-do"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "In công việc"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Thư mục chứa các mục to-do"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "Cuộc hẹn mới"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "_Cuộc hẹn"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "_Cuộc họp"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 msgid "Create a new meeting request"
 msgstr "Tạo yêu cầu cuộc họp mới"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Công việc mới"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "Nhiệm _vụ"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Tạo công việc mới"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "New All Day Appointment"
 msgstr "Cuộc hẹn nguyên ngày mới"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "All _Day Appointment"
 msgstr "Cuộc hẹn n_guyên ngày"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 msgid "Create a new all-day appointment"
 msgstr "Tạo cuộc hẹn nguyên ngày mới"
 
@@ -3826,29 +3876,30 @@ msgid "Alarm Repeat"
 msgstr "Lặp báo động"
 
 #: 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 ""
+"Đây là bộ nhắc email, nhưng Evolution chưa hỗ trợ kiểu nhắc nhở này. Bạn sẽ "
+"không thể sửa tùy chọn cho bộ nhắc nhở này."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Thông điệp hiển thị"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Phát âm thanh:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Lặp báo động"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Chạy chương trình:"
 
-#: 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 ""
-"Đây là bộ nhắc email, nhưng Evolution chưa hỗ trợ kiểu nhắc nhở này. Bạn sẽ "
-"không thể sửa tùy chọn cho bộ nhắc nhở này."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Với tham số này:"
@@ -3872,110 +3923,110 @@ msgstr "giờ"
 msgid "minutes"
 msgstr "phút"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d ngày"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 ngày"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d tuần"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 tuần"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d giờ"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 giờ"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d phút"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 phút"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d giây"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 giây"
 
-#: 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 "Phát âm thanh"
 
-#: 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 "Hiện thông điệp"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Gửi thư"
 
-#: 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 "Chạy chương trình"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Hành động khác cần thực hiện"
 
-#: 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 trước khi bắt đầu cuộc hẹn"
 
-#: 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 sau khi bắt đầu cuộc hẹn"
 
-#: 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 ngay khi bắt đầu cuộc hẹn"
 
-#: 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 trước khi kết thúc cuộc hẹn"
 
-#: 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 sau khi kết thức cuộc hẹn"
 
-#: 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 ngay khi kết thúc cuộc hẹn"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s tạ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 cho loại trigger lạ"
@@ -3996,7 +4047,7 @@ msgstr "Bộ nhắc nhở"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:778 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 "Tóm tắt:"
 
@@ -4242,7 +4293,9 @@ msgstr "trước khi mỗi cuộc hẹn"
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
-msgstr "Sự kiện này sẽ bị xóa khỏi cuộc họp, bạn có muốn gửi thông báo hủy sự kiện này không?"
+msgstr ""
+"Sự kiện này sẽ bị xóa khỏi cuộc họp, bạn có muốn gửi thông báo hủy sự kiện "
+"này không?"
 
 #: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
@@ -4252,7 +4305,9 @@ msgstr "Bạn có chắc muốn hủy bỏ và xoá cuộc họp này?"
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
-msgstr "Công việc sẽ bị xóa này đã được phân công, bạn có muốn gửi thông báo hủy công việc này không?"
+msgstr ""
+"Công việc sẽ bị xóa này đã được phân công, bạn có muốn gửi thông báo hủy "
+"công việc này không?"
 
 #: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
@@ -4376,8 +4431,8 @@ msgid "No summary"
 msgstr "Không có tóm tắt"
 
 #: 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:3789 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 "Lưu là..."
 
@@ -4386,7 +4441,8 @@ msgstr "Lưu là..."
 #: calendar/gui/dialogs/comp-editor.c:1369
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
-msgstr "Thay đổi trên mục này có thể bị hủy nếu bản cập nhật đến qua đường email"
+msgstr ""
+"Thay đổi trên mục này có thể bị hủy nếu bản cập nhật đến qua đường email"
 
 #: calendar/gui/dialogs/comp-editor.c:1396
 msgid "Unable to obtain current version!"
@@ -4446,27 +4502,27 @@ msgstr "Ủy nhiệm cho:"
 msgid "Enter Delegate"
 msgstr "Nhập người đại diện"
 
-#: 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 "Cuộc hẹn"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Bộ nhắc nhở"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Đệ quy"
 
-#: 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 "Lập lịch biểu"
 
-#: 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 "Cuộc họp"
 
@@ -4535,19 +4591,19 @@ msgstr "Thời điểm _cuối:"
 msgid "_Start time:"
 msgstr "Thời điểm đầ_u:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Cần một tổ chức."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Cần ít nhất một người tham dự."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Người này đã có tên trong cuộc họp rồi!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "Ủ_y nhiệm cho..."
 
@@ -4587,7 +4643,7 @@ msgid "Member"
 msgstr "Thành viên"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4599,7 +4655,7 @@ msgstr "Vai trò"
 
 #: 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 "Trạng thái"
@@ -4800,7 +4856,7 @@ msgstr "Ngày hoàn thành:"
 
 #: 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 "Cần hành động"
 
@@ -4809,7 +4865,7 @@ msgid "Progress"
 msgstr "Tiến trình"
 
 #: 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:"
 
@@ -4821,17 +4877,17 @@ msgstr "Độ ư_u tiên:"
 msgid "_Status:"
 msgstr "_Trạng thái:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Cơ bản"
 
-#: 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 "Phân công"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:832
+#: 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:"
@@ -4906,7 +4962,7 @@ msgid "Deleting selected objects"
 msgstr "Đang xóa đối tượng được chọn"
 
 #: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
-#: calendar/gui/e-week-view.c:3575 mail/folder-browser.c:1723
+#: 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 "_Mở"
@@ -4916,7 +4972,7 @@ msgid "_Save as..."
 msgstr "Lư_u là..."
 
 #: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
-#: calendar/gui/e-week-view.c:3549 calendar/gui/e-week-view.c:3577
+#: 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
@@ -4924,21 +4980,21 @@ msgid "_Print..."
 msgstr "_In..."
 
 #: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
-#: calendar/gui/e-week-view.c:3582 ui/evolution-addressbook.xml.h:1
+#: 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ắt"
 
 #: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
-#: calendar/gui/e-week-view.c:3583 ui/evolution-addressbook.xml.h:30
+#: 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 "_Sao chép"
 
 #: 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:3553
-#: calendar/gui/e-week-view.c:3584 ui/evolution-addressbook.xml.h:37
+#: 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"
@@ -4964,12 +5020,12 @@ msgstr "Đánh _dấu công việc hoàn tất"
 msgid "_Delete Selected Tasks"
 msgstr "Xóa côn_g việc được chọn"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7638
-#: calendar/gui/e-week-view.c:4290
+#: 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 "Đang cập nhật đối tượng"
 
-#: 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 "Nhấn để thêm công việc"
@@ -5008,7 +5064,7 @@ msgid "Start Date"
 msgstr "Ngày bắt đầu"
 
 #: 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 "Tóm tắt"
@@ -5079,15 +5135,15 @@ msgstr "pm"
 msgid "New _Appointment"
 msgstr "Cuộc _hẹn mới"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3543
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "Sự _kiện mọi ngày mới"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3544
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 msgid "New Meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "Công việc mới"
 
@@ -5095,418 +5151,426 @@ msgstr "Công việc mới"
 msgid "Print..."
 msgstr "In..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3559
+#: 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 "Đi tới ngày _hôm nay"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3560
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "Đi tới _ngày..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3564
+#: 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 "_Công bố thông tin bận/rảnh"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 msgid "_Configure..."
 msgstr "_Cấu hình..."
 
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 msgid "_Configure Pilot..."
 msgstr "_Cấu hình Pilot..."
 
-#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3576
-#: mail/folder-browser.c:1725 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 "Lư_u là..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3588
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 msgid "_Schedule Meeting..."
 msgstr "Lập lịch _cuộc họp..."
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3589
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 msgid "_Forward as iCalendar..."
 msgstr "_Chuyển như iCalendar..."
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3594
+#: 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:3772 calendar/gui/e-week-view.c:3595
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "_Xóa lần này"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3596
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: calendar/gui/e-day-view.c:4135 calendar/gui/e-week-view.c:3917
-#: 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 "Công cụ GNOME Pilot có lẽ chưa được cài đặt trên hệ thống này."
 
-#: calendar/gui/e-day-view.c:4141 calendar/gui/e-week-view.c:3923
-#: 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 "Lỗi thực hiện %s."
 
-#: calendar/gui/e-itip-control.c:587
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr "<b>Bắt đầu:</b> "
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:600
 msgid "<b>Ends:</b> "
 msgstr "<b>Kết thúc:</b>"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:613
 msgid "<b>Completed:</b> "
 msgstr "<b>Hoàn tất:</b>"
 
-#: calendar/gui/e-itip-control.c:620
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr "<b>Tới hạn:</b>"
 
-#: calendar/gui/e-itip-control.c:657 calendar/gui/e-itip-control.c:707
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "Thông tin iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "Lỗi iCalendar"
 
-#: calendar/gui/e-itip-control.c:738 calendar/gui/e-itip-control.c:754
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "Người lạ"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:761
+#: 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> Vui lòng xem lại các chỉ dẫn sau và chọn một hành động từ menu bên dưới."
 
-#: calendar/gui/e-itip-control.c:776
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Không</i>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:789
 msgid "Location:"
 msgstr "Địa điểm:"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "Trạng thái:"
 
-#: calendar/gui/e-itip-control.c:805 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 "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 msgid "Tentatively Accepted"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:813 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 "Từ chối"
 
-#: calendar/gui/e-itip-control.c:817 calendar/gui/e-itip-control.c:1023
+#: 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: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 "Lạ"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:898
-#: calendar/gui/e-itip-control.c:924 calendar/gui/e-itip-control.c:937
-#: calendar/gui/e-itip-control.c:950 calendar/gui/e-itip-control.c:963
+#: 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 "Chọn hành động:"
 
-#: calendar/gui/e-itip-control.c:871
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Cập nhật"
 
-#: calendar/gui/e-itip-control.c:872 calendar/gui/e-itip-control.c:903
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:939
-#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:965
-#: 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 "Đồng ý"
 
-#: calendar/gui/e-itip-control.c:899
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:900
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Gửi thông tin Rảnh/Bận"
 
-#: calendar/gui/e-itip-control.c:938
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Cập nhật trạng thái trả lời"
 
-#: calendar/gui/e-itip-control.c:951
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Gửi thông tin mới nhất"
 
-#: calendar/gui/e-itip-control.c:964 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 "Bỏ"
 
-#: calendar/gui/e-itip-control.c:1042
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> đã công bố thông tin cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Thông tin cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1050
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> yêu cầu sự hiện diện của bạn tại cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Đề nghị cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1055
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b? muốn được dự cuộc họp đã có."
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1057
+#: calendar/gui/e-itip-control.c:1060
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> muốn nhận thông tin mới nhất về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Yêu cầu cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1065
+#: calendar/gui/e-itip-control.c:1068
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> đã trả lời yêu cầu họp."
 
-#: calendar/gui/e-itip-control.c:1066
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Trả lời họp"
 
-#: calendar/gui/e-itip-control.c:1073
+#: calendar/gui/e-itip-control.c:1076
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> đã hủy bỏ cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1074
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Hủy bỏ cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1081 calendar/gui/e-itip-control.c:1142
-#: calendar/gui/e-itip-control.c:1177
+#: 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> đã gửi một thông điệp khó hiểu."
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Thông điệp lạ về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1106
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> đã công bố thông tin công việc."
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1111
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> yêu cầu thực hiện công việc."
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Đề nghị công việc"
 
-#: calendar/gui/e-itip-control.c:1113
+#: calendar/gui/e-itip-control.c:1116
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> muốn thêm vào công việc đã có."
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1121
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> muốn nhận thông tin mới nhất về công việc."
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Yêu cầu cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1129
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> đã trả lời việc gán công việc."
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Trả lời công việc"
 
-#: calendar/gui/e-itip-control.c:1134
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> đã hủy bỏ công việc."
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Hủy bỏ công việc"
 
-#: calendar/gui/e-itip-control.c:1143
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Thông điệp lạ về công việc"
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> đã công bố thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1170
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> yêu cầu thông tin bận/rảnh của bạn."
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Yêu cầu thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1175
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> đã trả lời yêu cầu thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Trả lời thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Thông điệp bận/rảnh sai"
 
-#: calendar/gui/e-itip-control.c:1233
+#: calendar/gui/e-itip-control.c:1236
 msgid "The message does not appear to be properly formed"
 msgstr "Thông điệp có lẽ không đúng hình thức"
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Thông điệp chỉ chứa yêu cầu chưa được hỗ trợ."
 
-#: calendar/gui/e-itip-control.c:1323 calendar/gui/e-itip-control.c:1329
+#: 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 "Đồ đính kèm không chứa thông điệp lịch hợp lệ"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "Đồ đính kèm không chứa mục lịch nào có thể xem được"
 
-#: calendar/gui/e-itip-control.c:1505 calendar/gui/e-itip-control.c:1597
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Đối tượng không hợp lệ và không thể được cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: 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 "Lỗi trong hệ thống CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 msgid "Object could not be found\n"
 msgstr "Không thể tìm thấy đối tượng\n"
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
-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 "Bạn không có đủ quyền để cập nhật lịch\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Hoàn tất cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Không thể cập nhật tập tin lịch!\n"
 
-#: calendar/gui/e-itip-control.c:1549 calendar/gui/e-itip-control.c:1615
+#: 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 ""
 "Không thể cập nhật trạng thái người tham dự vì chưa có người nào tham dự"
 
-#: calendar/gui/e-itip-control.c:1570
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Hồi đáp này đến từ một người dự hiện thời. Thêm người này như là người tham dự nhé?"
+msgstr ""
+"Hồi đáp này đến từ một người dự hiện thời. Thêm người này như là người tham "
+"dự nhé?"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1585
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Không thể cập nhật trạng thái người tham dự vì trạng thái không hợp lệ!\n"
 
 #: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "Bạn không có đủ quyền để cập nhật lịch\n"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Đã cập nhật trạng thái người tham dự\n"
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Không thể cập nhật trạng thái người tham dự!\n"
 
-#: calendar/gui/e-itip-control.c:1647
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Hoàn tất loại bỏ"
 
-#: calendar/gui/e-itip-control.c:1677 calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "Đã gửi!\n"
 
-#: calendar/gui/e-itip-control.c:1679 calendar/gui/e-itip-control.c:1731
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:1807
 msgid "Select Calendar Folder"
 msgstr "Chọn thư mục lịch"
 
-#: calendar/gui/e-itip-control.c:1811
+#: calendar/gui/e-itip-control.c:1814
 msgid "Select Tasks Folder"
 msgstr "Chọn thư mục công việc"
 
@@ -5551,7 +5615,7 @@ msgstr "ngày bắt đầu"
 msgid "Chair Persons"
 msgstr "Người chủ trì"
 
-#: 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 "Người tham dự yêu cầu"
 
@@ -5564,52 +5628,52 @@ msgid "Resources"
 msgstr "Tài nguyên"
 
 #: 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 "Cá nhân"
 
 #: 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 "Nhóm"
 
 #: 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 "Tài nguyên"
 
 #: 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 "Phòng"
 
 #: 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 "Ghế"
 
 #: 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 "Người tham dự yêu cầu"
 
 #: 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 "Người tham dự không yêu cầu"
 
 #: 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 "Người không tham dự"
 
 #: 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 "Có thể làm"
 
 #: 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 "Ủy nhiệm"
 
@@ -5699,40 +5763,47 @@ msgstr "Lúc _bắt đầu cuộc họp:"
 msgid "Meeting _end time:"
 msgstr "Lúc _kết thúc cuộc họp:"
 
-#: 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 "Đang mở công việc tại %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 "Không thể nập những công việc trong `%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 "Chưa hỗ trợ phương thức yêu cầu để nạp `%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
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Bạn không có đủ quyền để mở thư mục trong '%s'"
 
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Lỗi lưu `%s': %s"
+
+#: calendar/gui/e-tasks.c:540
 msgid "Completing tasks..."
 msgstr "Đang hoàn tất công việc..."
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 msgid "Deleting selected objects..."
 msgstr "Đang xóa đối tượng được chọn..."
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Đang xóa"
 
-#: calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
@@ -5752,7 +5823,7 @@ msgstr "Chưa hỗ trợ phương thức yêu cầu để mở `%s'"
 msgid "Adding alarms for %s"
 msgstr "Đang thêm báo động cho %s"
 
-#: calendar/gui/gnome-cal.c:1745
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5763,7 +5834,7 @@ msgstr ""
 "%s\n"
 "đã hỏng. Bạn sẽ cần phải khởi động lại Evolution để dùng nó lần sau."
 
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5774,12 +5845,12 @@ msgstr ""
 "%s\n"
 "đã hỏng. Bạn sẽ cần phải khởi động lại Evolution để dùng nó lần sau."
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Đang mở lịch tại %s"
 
-#: calendar/gui/gnome-cal.c:2009
+#: calendar/gui/gnome-cal.c:2029
 msgid "Opening default tasks folder"
 msgstr "Đang mở thư mục công việc mặc định"
 
@@ -5839,47 +5910,56 @@ msgstr "Tháng Mười"
 msgid "September"
 msgstr "Tháng Chín"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Cần ít nhất một người tham dự."
-
-#: 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 "Phải chọn một tổ chức."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Cần ít nhất một người tham dự."
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Thông tin sự kiện"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Thông tin nhật ký"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Thông tin rảnh/bận"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Thông tin lịch"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr "Cập nhật"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr "Phản đề nghị"
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Thông tin rảnh/bận (%s tới %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "Thông tin iCalendar"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Bạn phải là người tham dự sự kiện."
 
@@ -6114,7 +6194,7 @@ msgid "Print Calendar"
 msgstr "In lịch"
 
 #: 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 "Xem thử bản in"
@@ -6137,7 +6217,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "URI của thư mục công việc cần hiển thị"
 
-#: calendar/gui/tasks-control.c: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"
@@ -6149,12 +6229,12 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những công việc này không?"
 
-#: calendar/gui/tasks-control.c: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 "Đừng hỏi tôi lần nữa"
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 msgid "Print Tasks"
 msgstr "In công việc"
 
@@ -6162,7 +6242,9 @@ msgstr "In công việc"
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
-msgstr "Evolution đã lấy những công việc trong thư mục lịch của bạn và tự động chuyển qua thư mục công việc mới."
+msgstr ""
+"Evolution đã lấy những công việc trong thư mục lịch của bạn và tự động "
+"chuyển qua thư mục công việc mới."
 
 #: calendar/gui/tasks-migrate.c:108
 msgid ""
@@ -6171,22 +6253,28 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution đã cố lấy những công việc trong thư mục lịch của bạn và tự động chuyển qua thư mục công việc mới.\n"
-"Một vài công việc có thể không được chuyển qua được, vì thế tiến trình này có thể sẽ được thực hiện lại trong tương lại."
+"Evolution đã cố lấy những công việc trong thư mục lịch của bạn và tự động "
+"chuyển qua thư mục công việc mới.\n"
+"Một vài công việc có thể không được chuyển qua được, vì thế tiến trình này "
+"có thể sẽ được thực hiện lại trong tương lại."
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr "Không thể mở '%s'; không có mục nào trong thư mục lịch để chuyển qua thư mục công việc."
+msgstr ""
+"Không thể mở '%s'; không có mục nào trong thư mục lịch để chuyển qua thư mục "
+"công việc."
 
 #: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
-msgstr "Không hỗ trợ phương thức yêu cầu để nạp '%s'; không có mục nào trong thư mục lịch để chuyển qua thư mục công việc."
+msgstr ""
+"Không hỗ trợ phương thức yêu cầu để nạp '%s'; không có mục nào trong thư mục "
+"lịch để chuyển qua thư mục công việc."
 
 #: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
@@ -6214,15 +6302,15 @@ msgstr "Không thể lấy danh sách kho lưu từ registry: %s"
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Không thể gọi GetFolderAtPath trên kho lưu: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 msgid "Reminder!!"
 msgstr "Bộ nhắc nhở!!"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 msgid "Calendar Events"
 msgstr "Sự kiện lịch"
 
-#: 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?"
@@ -6230,7 +6318,7 @@ msgstr ""
 "Evolution tìm thấy các tập tin Lịch Gnome.\n"
 "Bạn có muốn nhập chúng vào Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 msgid "Gnome Calendar"
 msgstr "Lịch Gnome"
 
@@ -6337,10 +6425,15 @@ msgstr "completed-before? cần một đối số"
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? cần đối số thứ nhất là time_t"
 
-#: calendar/pcs/query.c:1215
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Định lượng biểu thức tìm kiếm không trả về giá trị boolean"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "lỗi phân tích"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8046,11 +8139,11 @@ msgstr "Thao tác chưa hỗ trợ: tìm theo biểu thức: cho %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Thao tác chưa hỗ trợ: tìm bằng UID: cho %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Đang di chuyển thông điệp"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Copying messages"
 msgstr "Đang chép thông điệp"
 
@@ -8369,7 +8462,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 "Trả lời xác thực từ server sai."
 
@@ -8424,50 +8517,50 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Biên dịch biểu thức chính quy thất bại: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' cần phần tên người dùng"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' cần phần máy chủ"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' cần phần đường dẫn"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Đang phân giải: %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 "Lỗi tra cứu tên: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Lỗi tra cứu máy chủ: %s: không tìm thấy máy chủ"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Lỗi tra cứu máy chủ: %s: lỗi lạ"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Đang phân giải địa chỉ"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 msgid "Host lookup failed: host not found"
 msgstr "Lỗi tra cứu máy chủ: không tìm thấy máy chủ"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 msgid "Host lookup failed: unknown reason"
 msgstr "Lỗi tra cứu máy chủ: lỗi lạ"
 
@@ -8654,7 +8747,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"
@@ -8663,11 +8756,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 "TỐT"
 
-#: 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 "XẤU"
 
@@ -8691,7 +8784,7 @@ msgstr ""
 "Bạn có muốn chấp nhận dù bất cứ giá nào?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8748,12 +8841,12 @@ msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2578
+#: camel/providers/imap/camel-imap-store.c:2641
 msgid "Operation cancelled"
 msgstr "Thao tác bị hủy bỏ"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server đã ngắt kết nối bất ngờ: %s"
@@ -8792,31 +8885,31 @@ msgstr "Tín hiệu trả lời của IMAP server không chứa thông tin %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Tín hiệu trả lời OK không mong đợi từ IMAP server: %s"
 
-#: 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 "Không thể tạo thư mục %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 "Không thể nạp tóm tắt cho %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 "Thư mục đã bị hủy và tạo lại trên server."
 
 #. 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 "Đang quét tìm các thông điệp thay đổi"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Không thể nhận thông điệp: %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
@@ -8832,28 +8925,24 @@ msgstr ""
 "Không thể lấy thông điệp: %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 "Không có thông điệp như vậy"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2435
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "Thông điệp này hiện thời chưa sẵn sàng"
 
-#: camel/providers/imap/camel-imap-folder.c:2092
-#: camel/providers/imap/camel-imap-folder.c:2169
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr "Đang lấy thông tin tóm tắt của các thông điệp mới"
 
-#: camel/providers/imap/camel-imap-folder.c:2098
-msgid "Scanning for new messages"
-msgstr "Đang quét tìm thông điệp mới"
-
-#: camel/providers/imap/camel-imap-folder.c:2473
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "Không thể tìm thấy phần thân thông điệp trong tín hiệu trả lời FETCH"
 
@@ -8924,73 +9013,68 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Tùy chọn này sẽ kết nối tới IMAP server bằng mật khẩu thô (không mã hóa)."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: 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 "dịch vụ IMAP cho %s trên %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 "Kết nối bị hủy bỏ"
 
-#: 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 "Không thể kết nối tới %s (cổng %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
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Lỗi kết nối tới IMAP server %s trong chế độ an toàn: %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "Chưa hỗ trợ phần mở rộng SSL/TLS."
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr "Thương lượng SSL thất bại"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, c-format
-msgid "The folder %s no longer exists"
-msgstr "Thư mục %s không còn tồn tại"
-
-#: 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 không hỗ trợ loại xác thực được yêu cầu %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 "Không hỗ trợ loại xác thực %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 "%sVui lòng nhập mật khẩu IMAP cho %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 "Bạn chưa nhập mật khẩu"
 
-#: 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"
@@ -9001,24 +9085,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 "Không có thư mục %s"
 
-#: 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 "Tên thư mục \"%s\" không hợp lệ vì chứa ký tự \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Thư mục cha lạ: %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 "Thư mục cha không được phép có các thư mục con"
 
@@ -9095,8 +9179,8 @@ msgstr ""
 "Ngoài ra còn có thể được dùng để đọc các thư mục kiểu Elm, Pine, hoặc Mutt."
 
 #: 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 "Gốc lưu %s không phải là đường dẫn tuyệt đối"
@@ -9108,7 +9192,7 @@ msgstr "Gốc lưu %s không phải là thư mục bình thường"
 
 #: 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 "Không thể lấy thư mục: %s: %s"
@@ -9122,22 +9206,22 @@ msgstr "Bộ lưu trữ cục bộ chưa có thư mục inbox"
 msgid "Local mail file %s"
 msgstr "Tập tin mail cục bộ %s"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:909
+#: 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 "Không thể đổi tên thư mục %s thành %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 "Không thể đổi tên '%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 "Không thể xóa tập tin tóm tắt thư mục `%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 "Không thể xóa tập tin chỉ mục thư mục `%s': %s"
@@ -9167,6 +9251,7 @@ msgstr "Nội dung thông điệp không hợp lệ"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9178,12 +9263,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 "Thư mục `%s' không tồn tại."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9209,7 +9296,8 @@ msgid "not a maildir directory"
 msgstr "không phải là thư mục dạng Maildir"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c: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 "Không thể quét thư mục `%s': %s"
@@ -9237,7 +9325,7 @@ msgid "Storing folder"
 msgstr "Đang lưu thư mục"
 
 #: 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 "Không thể tạo khóa thư mục trên %s: %s"
@@ -9406,40 +9494,45 @@ msgstr "`%s' không phải là thư mục."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Không thể mở đường dẫn thư mục dạng MH: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Không thể mở spool `%s': %s"
 
-#: 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 "Spool `%s' không phải là tập tin hay thư mục bình thường"
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Thư mục `%s/%s' không tồn tại"
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' không phải là tập tin bình thường."
+
+#: 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 "Tập tin spool %s"
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool folder tree %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Không thể đổi tên thư mục spool"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Không thể xóa thư mục spool"
 
@@ -9531,47 +9624,47 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr "Thao tác thất bại: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Đang nhậm tóm tắt 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 "Người dùng đã hủy bỏ"
 
-#: 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 "Không thể lấy tóm tắt POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Đang bỏ các thông điệp cần xóa "
 
-#: 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 "Không có thông điệp nào vời 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 "Đang nhận thông điệp 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 "Không thể lấy thông điệp %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Nguyên nhân lạ"
 
@@ -9837,40 +9930,40 @@ msgstr "Lỗi xác thực tạm"
 msgid "Authentication required"
 msgstr "Yêu cầu xác thực"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "Welcome response error"
 msgstr "Lỗi hồi đáp chào mừng"
 
-#: 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 "Lỗi kết nối tới SMTP server %s trong chế độ không an toàn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 msgid "server does not appear to support SSL"
 msgstr "server có lẽ không hỗ trợ 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 "Yêu cầu STARTTLS quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 msgid "STARTTLS response error"
 msgstr "Lỗi hồi đáp STARTTLS"
 
-#: 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 không hỗ trợ loại xác thực yêu cầu loại %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 "%sVui lòng nhập mật khẩu SMTP cho %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"
@@ -9881,87 +9974,87 @@ 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 "Gửi thư (SMTP) thông qua %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 "Không thể gửi thông điệp: địaa chỉ người gửi không hợp lệ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Đang gửi thông điệp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Không thể gửi thông điệp: chưa có người nhận."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Không thể gửi thông điệp: có một hoặc vài người nhận không hợp lệ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "Chào hỏi của SMTP"
 
-#: 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 "Yêu cầu HELO quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr "Lỗi hồi đáp HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "xác thực SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Lỗi tạo đối tượng xác thực SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c: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 "Yêu cầu AUTH quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Yêu cầu AUTH thất bại."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Trả lời xác thực từ server sai.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu MAIL FROM: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Lỗi hồi đáp 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 "Quá hạn yêu cầu RCPT TO: %s: chưa gửi mail"
 
-#: 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> thất bại"
 
-#: 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 "Quá hạn yêu cầu DATA: %s: chưa gửi mail"
@@ -9969,76 +10062,67 @@ msgstr "Quá hạn yêu cầu DATA: %s: chưa gửi mail"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr "Lỗi hồi đáp 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 "Quá hạn gửi DATA: chấm dứt thông điệp: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "Lỗi hồi đáp kết thúc 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 "Quá hạn yêu cầu RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "Lỗi hồi đáp RSET"
 
-#: 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 "Yêu cầu QUIT quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "Lỗi hồi đáp QUIT"
 
-#: 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 "đồ đính kèm"
 
-#: 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 "Loại bỏ những mục được chọn từ danh sách đồ đính kèm"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Thêm đồ đính kèm..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Đính kèm tập tin vào thông điệp"
 
@@ -10070,7 +10154,7 @@ msgstr "Kiểu MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Đề nghị tự động hiển thị đồ đính kèm"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Nhấn vào đây để xem sổ địa chỉ"
 
@@ -10081,45 +10165,45 @@ msgstr "Nhấn vào đây để xem sổ địa chỉ"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Trả lời cho:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Từ:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Chủ đề:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Tới:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Nhập người nhận thông điệp"
 
-#: 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 "Nhập địa chỉ sẽ nhận một bản sao của thông điệp"
 
-#: 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."
@@ -10130,11 +10214,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 msgid "Post To:"
 msgstr "Gửi tới:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 msgid "Posting destination"
 msgstr "Đích gửi đến"
 
@@ -10147,7 +10231,7 @@ msgstr "Đính kèm tập tin"
 msgid "Could not create a PGP signature context"
 msgstr "Không thể tạo ngữ cảnh chữ ký PGP"
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10156,34 +10240,34 @@ msgstr ""
 "Lỗi đọc tập tin %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Cảnh báo!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Tập tin đã tồn tại, ghi đè chứ?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Lỗi lưu tập tin: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Lỗi nạp tập tin: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Lỗi truy cập tập tin: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Không thể nhận thông điệp từ trình biên soạn"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10192,7 +10276,7 @@ msgstr ""
 "Không thể tìm trong tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10201,7 +10285,7 @@ msgstr ""
 "Không thể cắt tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10210,7 +10294,7 @@ msgstr ""
 "Lỗi tự động lưu thông điệp: %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?"
@@ -10218,7 +10302,7 @@ msgstr ""
 "Ximian Evolution đã tìm thấy các tập tin chưa được lưu từ session trước.\n"
 "Bạn có muốn phục hồi chúng không?"
 
-#: composer/e-msg-composer.c:1519
+#: composer/e-msg-composer.c:1525
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10229,27 +10313,27 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi?"
 
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Cảnh báo: Thông điệp đã thay đổi"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Mở tập tin"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 msgid "Signature:"
 msgstr "Chữ ký:"
 
-#: 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 "Tự phát sinh"
 
-#: 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 "Biên soạn thông điệp"
 
-#: 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."
@@ -10257,7 +10341,18 @@ msgstr ""
 "Không thể tạo cửa sổ biên soạn:\n"
 "Không thể kích hoạt bộ chọn địa chỉ."
 
-#: composer/e-msg-composer.c: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 ""
+"Không thể tạo cửa sổ biên soạn:\n"
+"Không thể kích hoạt bộ biên soạn HTML."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10265,13 +10360,15 @@ msgstr ""
 "Không thể tạo cửa sổ biên soạn:\n"
 "Không thể kích hoạt bộ biên soạn HTML."
 
-#: composer/e-msg-composer.c:3850
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(Bộ soạn thảo chứa phần thân thông điệp phi văn bản, không thể được hiệu chỉnh)</b>"
+msgstr ""
+"<b>(Bộ soạn thảo chứa phần thân thông điệp phi văn bản, không thể được hiệu "
+"chỉnh)</b>"
 
-#: composer/evolution-composer.c: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."
@@ -10279,8 +10376,9 @@ msgstr ""
 "Không thể tạo cửa sổ biên soạn vì bạn chưa cấu hình thực \n"
 "thể nào trong thành phần mail."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Không thể khởi động bộ soạn thảo của Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10331,8 +10429,8 @@ msgstr "Chủ đề chứa"
 msgid "Subject does not contain"
 msgstr "Chủ đề không chứa"
 
-#: 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?"
@@ -10480,7 +10578,8 @@ msgid "years"
 msgstr "năm"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Bạn quên chưa chọn ngày"
 
 #: filter/filter-datespec.c:269
@@ -10533,15 +10632,12 @@ msgid "Add action"
 msgstr "Thêm hành động"
 
 #: 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 ""
-"Bạn quên chưa chọn thư mục.\n"
-"Vui lòng quay lại và chọn một thư mục hợp lệ để gửi thư tới."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Bạn phải xác định tên tập tin"
 
-#: 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 "Chọn thư mục"
 
@@ -10554,7 +10650,7 @@ msgstr ""
 "Lỗi trong biểu thức chính quy '%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 "Quan trọng"
@@ -10731,219 +10827,219 @@ msgid "Beep"
 msgstr "Bíp"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "chứa"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Chép vào thư mục"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Ngày nhận"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Ngày gửi"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Đã xóa"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "không chứa"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "không kết thúc bằng"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "không tồn tại"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "không trả về"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "không giống với"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "không bắt đầu bằng"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Không tồn tại"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Nháp"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "kết thúc bằng"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Tồn tại"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "tồn tại"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Biểu thức"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "bằng"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "sau"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "trước"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "được đặt cờ"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "lớn hơn"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "nhỏ hơn"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "không phải"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "không được đặt cờ"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1760
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 msgid "Label"
 msgstr "Nhãn"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Thân thông điệp"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Đầu thông điệp"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Chuyển vào thư mục"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 msgid "Pipe Message to Shell Command"
 msgstr "Gửi thông điệp cho lệnh shell qua ống dẫn"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 msgid "Play Sound"
 msgstr "Phát âm thanh"
 
-#: 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 "Đọc"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Người nhận"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Khớp Regex"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Trả lời cho"
 
-#: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr "trả về"
-
-#: filter/libfilter-i18n.h:47
-msgid "returns greater than"
-msgstr "trả về lớn hơn"
-
-#: filter/libfilter-i18n.h:48
-msgid "returns less than"
-msgstr "trả về nhỏ hơn"
-
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:29
 msgid "Run Once"
 msgstr "Chạy một lần"
 
-#: 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 "Điểm"
 
-#: filter/libfilter-i18n.h:51 mail/mail-callbacks.c:1807
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Người gửi"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Đặt trạng thái"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:33
 msgid "Shell Command"
 msgstr "Lệnh shell"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Kích thước (kB)"
 
-#: filter/libfilter-i18n.h:55
-msgid "sounds like"
-msgstr "giống như"
-
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Tài khoản nguồn"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Header xác định"
 
-#: filter/libfilter-i18n.h:58
-msgid "starts with"
-msgstr "bắt đầu bằng"
-
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Dừng tiến trình"
 
-#: filter/libfilter-i18n.h:61 mail/mail-format.c:932
-#: 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 "Chủ đề"
 
-#: filter/libfilter-i18n.h:62
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Bỏ đặt trạng thái"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "chứa"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "không chứa"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "không kết thúc bằng"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "không tồn tại"
+
+#: filter/libfilter-i18n.h:45
+msgid "does not return"
+msgstr "không trả về"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "không giống với"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "không bắt đầu bằng"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "kết thúc bằng"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "tồn tại"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "được đặt cờ"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "sau"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "trước"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "lớn hơn"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "nhỏ hơn"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "không được đặt cờ"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "không phải"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "bằng"
+
+#: filter/libfilter-i18n.h:58
+msgid "returns greater than"
+msgstr "trả về lớn hơn"
+
+#: filter/libfilter-i18n.h:59
+msgid "returns less than"
+msgstr "trả về nhỏ hơn"
+
+#: filter/libfilter-i18n.h:60
+msgid "returns"
+msgstr "trả về"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "giống như"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "bắt đầu bằng"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Quy tắc"
@@ -10977,31 +11073,31 @@ msgstr "Bạn cần chọn ít nhất một thư mục làm nguồn."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution đang nhập các thư cũ (dạng Elm)"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Đang nhập..."
 
-#: 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 "Vui lòng chờ"
 
-#: 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 "Đang nhập %s như là %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 "Đang quét %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 "Thư"
 
@@ -11062,37 +11158,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 đang nhập các dữ liệu cũ từ 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 "Rác"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 msgid "Scanning mail filters"
 msgstr "Đang quét bộ lọc thư"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Đang quét thư mục"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Đang nhập"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Thiết lập"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 msgid "Mail Filters"
 msgstr "Bộ lọc thư"
 
-#: 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?"
@@ -11139,7 +11235,9 @@ msgstr "Điều khiển cấu hình cho Bộ soạn thảo thông điệp Evolut
 #: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
-msgstr "Cấu hình thông số thư tín, bao gồm tính bảo mật và hiển thị thông điệp, ở đây."
+msgstr ""
+"Cấu hình thông số thư tín, bao gồm tính bảo mật và hiển thị thông điệp, ở "
+"đây."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Configure spell-checking, signatures, and the message composer here"
@@ -11202,26 +11300,36 @@ msgid "Folder containing mail"
 msgstr "Thư mục đang chứa thư"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Công cộng"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Thư mục đang chứa thư"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Thùng rác ảo"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Thư mục Thùng rác ảo"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Thư mục này chứa các thông điệp."
 
-#: mail/component-factory.c:414
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Thuộc tính..."
 
-#: mail/component-factory.c:414
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Thay đổi thuộc tính thư mục này"
 
-#: mail/component-factory.c:792
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11229,72 +11337,73 @@ msgstr ""
 "Một vài thiết lập về thư của bạn đã bị hỏng, vui lòng kiểm tra để chắc chắn "
 "rằng mọi thứ vẫn hoạt động."
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Bạn chưa thiết lập phương thức vận chuyển thư."
 
-#: mail/component-factory.c:979
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Bạn có vài thông điệp chưa gửi, bạn vẫn muốn thoát chứ?"
 
-#: mail/component-factory.c:985
+#: mail/component-factory.c:998
 msgid "Warning: Unsent Messages"
 msgstr "Cảnh báo: Thông điệp chưa gửi"
 
-#: mail/component-factory.c:1027
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Thông điệp thư mới"
 
-#: mail/component-factory.c:1027
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "Thông điệp thư"
 
-#: mail/component-factory.c:1028
+#: mail/component-factory.c:1041
 msgid "Compose a new mail message"
 msgstr "Biên soạn thông điệp mới"
 
-#: mail/component-factory.c:1036
+#: mail/component-factory.c:1049
 msgid "New Message Post"
 msgstr ""
 
-#: mail/component-factory.c:1036
+#: mail/component-factory.c:1049
 msgid "_Post Message"
 msgstr "_Gửi thông điệp"
 
-#: mail/component-factory.c:1037
+#: mail/component-factory.c:1050
 msgid "Post a new mail message"
 msgstr "Gửi thông điệp thư mới"
 
-#: mail/component-factory.c:1065
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "Không thể khởi động thành phần thư của Evolution"
 
-#: mail/component-factory.c:1074
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Không thể khởi động thành phần cấu hình thư của Evolution"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Không thể khởi động thành phần thông tin thư mục của Evolution."
 
-#: mail/component-factory.c:1312 mail/component-factory.c:1342
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 msgid "Connecting..."
 msgstr "Đang kết nối..."
 
-#: mail/component-factory.c:1353
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Không thể đăng ký kho lưu với shell"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Thuộc tính của \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: 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 "Không thể tạo thư mục tạm: %s"
@@ -11343,125 +11452,125 @@ msgstr "tổng cộng %d"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Tạo thư mục ả_o từ kết quả tìm kiếm..."
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "VFolder trên Mailing _List"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo n_gười nhận"
 
-#: mail/folder-browser.c:1706 mail/folder-browser.c:2029
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "Lọc _Mailing list"
 
-#: mail/folder-browser.c:1724
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thông điệp mới..."
 
-#: mail/folder-browser.c:1726
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_In"
 
-#: mail/folder-browser.c:1730 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Trả lời _danh sách"
 
-#: mail/folder-browser.c:1732 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: mail/folder-browser.c:1737
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1735
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1736
 msgid "Cl_ear Flag"
 msgstr "Xó_a cờ"
 
 #. separator here?
-#: mail/folder-browser.c:1743 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 "Đánh dấu đã đọ_c"
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1741
 msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/folder-browser.c:1746
+#: mail/folder-browser.c:1743
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1748
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1755
+#: mail/folder-browser.c:1752
 msgid "Mo_ve to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: mail/folder-browser.c:1756 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "C_hép vào thư mục..."
 
-#: mail/folder-browser.c:1764
+#: mail/folder-browser.c:1761
 msgid "Add Sender to Address_book"
 msgstr "Thêm người _gửi vào sổ địa chỉ"
 
-#: mail/folder-browser.c:1768
+#: mail/folder-browser.c:1765
 msgid "Appl_y Filters"
 msgstr "Áp dụng _bộ lọc"
 
-#: mail/folder-browser.c:1772
+#: mail/folder-browser.c:1769
 msgid "Crea_te Rule From Message"
 msgstr "Tạo _quy tắc từ thông điệp"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2027
 msgid "VFolder on M_ailing List"
 msgstr "VFolder trên M_ailing List"
 
-#: mail/folder-browser.c:2032
+#: mail/folder-browser.c:2029
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Bộ lọc trên _Mailing List (%s)"
 
-#: mail/folder-browser.c:2033
+#: mail/folder-browser.c:2030
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder trên M_ailing List (%s)"
@@ -11534,19 +11643,19 @@ msgstr "Bạn chưa điền đủ các thông tin yêu cầu."
 msgid "Evolution Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_Máy chủ:"
 
-#: 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 "_Tên người dùng:"
 
-#: 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 "Đường _dẫn:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Bạn không thể tạo hai tài khoản trùng tên."
 
@@ -11653,9 +11762,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 ""
 "Bạn đang gửi một lá thư dùng dạng thức HTML, nhưng người nhận không muốn "
 "nhận những lá thư HTML:\n"
@@ -11706,65 +11816,65 @@ msgstr ""
 "Không thể mở thư mục Nháp cho tài khoản này.\n"
 "Bạn có muốn dùng thư mục Nháp mặc định?"
 
-#: mail/mail-callbacks.c:1183
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "người gửi lạ"
 
-#: mail/mail-callbacks.c:1187
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Vào ngày %a, %d/%m/%Y lúc %H:%M, %s viết rằng:"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Chuyển thông điệp tới"
 
-#: mail/mail-callbacks.c:1690 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Chép thông điệp vào"
 
-#: mail/mail-callbacks.c:2357
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Bạn có chắc muốn sửa tất cả %d thông điệp?"
 
-#: mail/mail-callbacks.c:2382
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Bạn chỉ có thể sửa những thông điệp trong thư mục Nháp."
 
-#: mail/mail-callbacks.c:2421
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Bạn chỉ có thể gửi lại những thông điệp trong thư mục Đã gửi"
 
-#: mail/mail-callbacks.c:2435
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Bạn có chắc muốn gửi lại %d thông điệp?"
 
-#: mail/mail-callbacks.c:2461
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Chưa chọn thông điệp"
 
-#: mail/mail-callbacks.c:2506 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Ghi đè tập tin?"
 
-#: mail/mail-callbacks.c:2560
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:2562
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:2631
+#: mail/mail-callbacks.c:2654
 msgid "Go to next folder with unread messages?"
 msgstr "Tới thư mục kế chứa thông điệp chưa đọc chứ?"
 
-#: 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?"
@@ -11772,7 +11882,7 @@ msgstr ""
 "Không còn thông điệp mới nào trong thư mục này.\n"
 "Bạn có muốn đi tới thư mục kế tiếp không?"
 
-#: 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"
@@ -11784,7 +11894,7 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những thông điệp này không?"
 
-#: mail/mail-callbacks.c:2994
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11793,28 +11903,28 @@ msgstr ""
 "Lỗi khi nạp thông tin bộ lọc:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3006
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Bộ lọc"
 
-#: mail/mail-callbacks.c:3050
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "Trang %d trên %d"
 
-#: mail/mail-callbacks.c:3105
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/mail-callbacks.c:3132
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3173
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Quá trình in thông điệp thất bại"
 
-#: 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 ""
@@ -11837,7 +11947,7 @@ msgstr " [script]"
 msgid "Please specify a valid script name"
 msgstr "Vui lòng xác định tên script"
 
-#: 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 "Vô danh"
 
@@ -11845,11 +11955,11 @@ msgstr "Vô danh"
 msgid "en"
 msgstr "en"
 
-#: mail/mail-composer-prefs.c:870
+#: mail/mail-composer-prefs.c:872
 msgid "Add script signature"
 msgstr "Thêm chữ ký tay"
 
-#: mail/mail-composer-prefs.c:871
+#: mail/mail-composer-prefs.c:873
 msgid "Add Signature"
 msgstr "Thêm chữ ký"
 
@@ -11901,16 +12011,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Phụ tá tài khoản Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr "Tài khoản %d"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Đang kiểm tra dịch vụ"
 
-#: 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 "Đang kết nối tới server..."
 
@@ -12340,7 +12450,9 @@ msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "Trang này cho phép bạn cấu hình hành vi kiểm tra chính tả và ngôn ngữ để kiểm tra. Danh sách ngôn ngữ phản ánh chỉ những ngôn ngữ bạn có cài đặt."
+msgstr ""
+"Trang này cho phép bạn cấu hình hành vi kiểm tra chính tả và ngôn ngữ để "
+"kiểm tra. Danh sách ngôn ngữ phản ánh chỉ những ngôn ngữ bạn có cài đặt."
 
 #: mail/mail-config.glade.h:128
 msgid ""
@@ -12556,74 +12668,70 @@ msgstr "Không thể tạo ngữ cảnh bao thư S/MIME"
 msgid "Could not create a S/MIME decode context."
 msgstr "Không thể tạo ngữ cảnh giải mã S/MIME"
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Lưu đồ đính kèm"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Không thể tạo thư mục tạm '%s': %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 msgid "Save Attachment..."
 msgstr "Lưu đồ đính kèm..."
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Xem Inline"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Mở bằng %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Xem Inline (thông qua %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Ẩn"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Trình xem ngoại"
 
-#: mail/mail-display.c:1285
+#: mail/mail-display.c:1319
 msgid "Downloading images"
 msgstr "Đang tải ảnh về"
 
-#: mail/mail-display.c:1460
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Đang nạp nôi dung thông điệp"
 
-#: mail/mail-display.c:1747
+#: mail/mail-display.c:1781
 msgid "Overdue:"
 msgstr "Quá hạn:"
 
-#: mail/mail-display.c:1751
+#: mail/mail-display.c:1785
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "bởi %d %B, %Y, %l:%M %P"
 
-#: mail/mail-display.c:1753
-msgid "at your earliest convenience"
-msgstr "để tiện nhất cho bạn"
-
-#: mail/mail-display.c:2075
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "Mở liên kết bằng trình duyệt"
 
-#: mail/mail-display.c:2076
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Sao chép vị trí liên kết"
 
-#: mail/mail-display.c:2078
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Chép liên kết là (CẦN SỬA)"
 
-#: mail/mail-display.c:2080
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Lưu ảnh là..."
 
@@ -12650,6 +12758,7 @@ msgid "Bad Address"
 msgstr "Địa chỉ sai"
 
 #: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Từ"
 
@@ -13007,20 +13116,20 @@ msgstr "Đang chờ..."
 msgid "User canceled operation."
 msgstr "Người dùng đã hủy bỏ tác vụ."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Nhập mật khẩu cho %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Nhập mật khẩu"
 
@@ -13029,11 +13138,11 @@ msgstr "Nhập mật khẩu"
 msgid "Could not save signature file: %s"
 msgstr "Không thể lưu tập tin chữ ký: %s"
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Lưu chữ ký"
 
-#: 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"
@@ -13043,11 +13152,11 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi không?"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr "Gõ tên mà bạn muốn dùng cho chữ ký này."
+#: 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 "Tên:"
 
@@ -13083,7 +13192,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"
 
@@ -13241,44 +13350,70 @@ msgstr "Trả lời tất cả"
 msgid "Review"
 msgstr "Xem lại"
 
-#: 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 "Hoàn tất"
+
+#: 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 "Xó_a cờ"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Đến hạn"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Đã đặt cờ"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Đang quét thư mục dưới %s trên \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Đang quét thư mục gốc trên \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Đang đăng ký trên thư mục \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Đang bỏ đăng ký trên thư mục \"%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 "Thư mục"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 msgid "Scanning folders..."
 msgstr "Đang quét thư mục..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Chưa chọn server"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Vui lòng chọn một server."
 
@@ -23168,11 +23303,11 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Không có mô tả"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Tóm tắt thư"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Thư mục cục bộ"
@@ -23183,23 +23318,23 @@ msgstr "Thư mục cục bộ"
 #. (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 Từ trong ngày"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Trích dẫn trong ngày"
 
-#: 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 ""
 
@@ -23236,11 +23371,11 @@ msgstr "(Không có mô tả)"
 msgid "My Weather"
 msgstr "Thời tiết của tôi"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr "Lỗi tải dữ liệu về cho"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Thời tiết"
 
@@ -24804,6 +24939,19 @@ msgstr "Đổi tên thư mục"
 msgid "The specified folder name is not valid: %s"
 msgstr "Tên thư mục xác định không hợp lệ: %s"
 
+#: shell/e-shell-folder-commands.c: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 ""
+"Không thể đổi tên thư mục:\n"
+"%s"
+
 #: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
@@ -24817,7 +24965,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Tạo thư mục mới"
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Mới..."
 
@@ -24847,20 +24995,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Vui lòng chọn thông tin bạn muốn nhập:"
 
-#. 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 ""
-"Đang nhập %s\n"
-"Bộ nhập chưa sẵn sàng\n"
-"Đang đợi 5 giây trước khi thử lại."
-
-#: 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"
@@ -24869,21 +25004,21 @@ msgstr ""
 "Đang nhập %s\n"
 "Đang nhập mục %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 msgid "Select importer"
 msgstr "Chọn bộ nhập"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Tập tin %s không tồn tại"
 
-#: 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 "Lỗi 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"
@@ -24892,11 +25027,11 @@ msgstr ""
 "Không có bộ nhập nào có thể xử lý\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Đang nhập"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24905,17 +25040,17 @@ msgstr ""
 "Đang nhập %s.\n"
 "Đang khởi động %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Lỗi khởi động %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Lỗi nạp %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24924,31 +25059,31 @@ msgstr ""
 "Đang nhập %s\n"
 "Đang nhập mục 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Tự động"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Tên tập tin:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Chọn tập tin"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Kiểu tập tin:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Nhập dữ liệu và thiết lập từ chương trình cũ"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Nhập tập tin đơn"
 
-#: 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"
@@ -24956,24 +25091,24 @@ msgstr ""
 "Vui lòng chờ...\n"
 "Đang quét tìm thiết lập hiện có"
 
-#: 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 "Đang khởi động bộ nhập thông minh"
 
-#: 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 "Từ %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Chọn một thư mục đích để nhập dữ liệu này"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Nhập"
 
@@ -25004,26 +25139,26 @@ msgstr "Đang đồng bộ \"%s\" (%d trên %d) ..."
 msgid "Evolution Settings"
 msgstr "Thiết lập Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 msgid "Opening Folder"
 msgstr "Đang mở thư mục"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Đang mở thư mục \"%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 "trong \"%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 "Không thể mở thư mục chia sẽ: %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 "Không tìm thấy thư mục chia sẽ xác định."
 
@@ -25062,43 +25197,43 @@ msgstr "Tên thư mục không thể chứa ký tự '/'"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' và '..' là hai tên thư mục đặc biệt, được dành riêng."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Không tìm thấy Buf buddy trong $PATH."
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Không thể chạy Bug buddy"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Về Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Đi tới thư mục..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Chọn thư mục bạn muốn mở"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 msgid "Create New Shortcut"
 msgstr "Tạo lối tắt mới"
 
-#: 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 "Chọn thư mục bạn muốn lối tắt chỉ đến:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "_Trực tuyến"
 
-#: 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 "_Ngoại tuyến"
 
-#: 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 "Ngoại tuyến"
 
@@ -25143,12 +25278,12 @@ msgstr ""
 "Lỗi từ hệ thống kích hoạt là:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Không thể thiết lập kho lưu cục bộ -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25159,19 +25294,19 @@ msgstr ""
 "dự kiến. Bạn sẽ kết thúc Evolution và khởi động lại để truy cập\n"
 "lại dữ liệu."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Đối số không hợp lệ"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Không thể đăng ký với OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Lỗi chung chung"
 
@@ -25306,59 +25441,59 @@ msgstr "Lối tắt"
 msgid "Checkbox"
 msgstr "Ô kiểm"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Không có lỗi"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Thư mục cùng tên đã tồn tại"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Kiểu thư mục không hợp lệ"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "Lỗi I/O"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Không đủ chỗ để tạp thư mục"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Thư mục không rỗng"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Không tìm thấy thư mục"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Chức năng này chưa được thực hiện trong kho lưu trữ này"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Chưa hỗ trợ tác vụ"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Kho chứa này chưa hộ trợ kiểu đã cho"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Thư mục đã cho không thể bị thay đổi hoặc loại bỏ"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Không thể tạo một thư mục con của một trong những descendant của nó"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Không thể tạo thư mục với tên đó"
 
-#: shell/e-storage.c:516
+#: shell/e-storage.c:586
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Thao tác này không thể được thực hiện trong chế độ ngoại tuyến"
 
@@ -25568,9 +25703,10 @@ msgstr ""
 "Vui lòng nhấn nút \"Kế tiếp\" để tiếp tục."
 
 #: 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 ""
@@ -25587,26 +25723,22 @@ msgid "Evolution Import Assistant"
 msgstr "Trợ tá nhập Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Trợ tá bộ nhập Evolution"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Nhập tập tin (bước 3 trên 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Kiểu bộ nhập (bước 1 trên 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Chọn bộ nhập (bước 2 trên 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Chọn tập tin (bước 2 trên 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"
@@ -25830,10 +25962,10 @@ msgstr "Xem liên lạc hiện thời"
 #: 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ành động"
 
@@ -25951,7 +26083,7 @@ msgid "Print this item"
 msgstr "In mục này"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Lưu"
 
@@ -25978,7 +26110,7 @@ msgstr "Lưu mục này vào đĩa"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Tập tin"
 
@@ -26060,7 +26192,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Lập lịch cuộc họp cho mục này"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Tùy biến Evolution Của Tôi"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26108,29 +26241,30 @@ msgid "Post a message to a Public folder"
 msgstr "Gửi thông điệp tới thư mục Công cộng"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Đă_ng ký thư mục..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Hiện khung xem trước"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Đăng ký hoặc hủy đăng ký thư mục trên server từ xa"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "Bộ hiệu chỉnh thư mục ảo..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Bộ lọc..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "Khung xem thử"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "Đă_ng ký thư mục..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Đổi thuộc tính thư mục này"
@@ -26225,7 +26359,7 @@ msgstr "Danh sách thông điệp theo nhánh"
 msgid "_Expunge"
 msgstr "_Bỏ"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_thư mục"
 
@@ -26522,7 +26656,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Tìm text trong thân thông điệp hiển thị"
 
 #: 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 "Cài đặt thiết lập trang cho máy in hiện thời"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26629,7 +26764,7 @@ msgstr "_Quoted"
 msgid "_Resend..."
 msgstr "Gửi _lại..."
 
-#: 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 "_Công cụ"
 
@@ -26644,12 +26779,12 @@ msgstr "Đóng cửa sổ này"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "Đón_g"
 
 #: 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 "_Xem"
 
@@ -26820,7 +26955,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Lưu tập tin hiện thời và đóng hộp thoại"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "Trợ _giúp"
 
@@ -26981,7 +27116,8 @@ msgid "Open Other _User's Folder..."
 msgstr "Mở thư mục của người dùng _khác..."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+#, fuzzy
+msgid "Open a folder belonging to some other user on the server"
 msgstr "Mở thư mục được tạo ra bởi người dùng khác trên server"
 
 #: ui/evolution.xml.h:23
@@ -26997,110 +27133,131 @@ msgid "Pi_lot Settings..."
 msgstr "Thiết lập Pi_lot..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Thiết lập pilot..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Mở thư mục của người dùng khác"
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Gửi / Nhận"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Send queued items and retrieve new items"
 msgstr "Gửi các mục đang đợi gửi và nhận các mục mới"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Thiết lập cấu hình Pilot"
+
+#: ui/evolution.xml.h:32
 msgid "Set up Pilot configuration"
 msgstr "Thiết lập cấu hình Pilot"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Hiện thông tin về Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "_Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Báo cáo lỗi, dùng Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Bật tắt"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Bật tắt hiện thanh thư mục"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Bật tắt hiện thanh lối tắt"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Bật tắt hoạt động ngoại tuyến"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Xem thư mục được chọn"
 
-#: 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 "_Giới thiệu Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Sao chép..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "Thanh Thư _mục"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 msgid "_Folder..."
 msgstr "_Thư mục..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "Đ_i tới thư mục..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Nhập..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Di chuyển..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "Mớ_i"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "Thư mục mớ_i"
 
-#: ui/evolution.xml.h:56
-msgid "_Preferences..."
-msgstr "_Thông số..."
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Remove Other User's Folder"
+msgstr "Mở thư mục của người dùng khác"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "Đổi _tên..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Gửi / Nhận"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Thiết lập"
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Thanh _lối tắt"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 msgid "_Shortcut..."
 msgstr "_Lối tắt..."
 
@@ -27329,11 +27486,11 @@ msgstr "Bộ mã"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Bộ biên soạn tìm kiếm"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Lưu tìm kiếm"
 
@@ -27408,6 +27565,46 @@ msgstr "init_corba(): không thể khởi động GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): không thể khởi động Bonobo"
 
+#~ msgid "Scanning for new messages"
+#~ msgstr "Đang quét tìm thông điệp mới"
+
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Thư mục %s không còn tồn tại"
+
+#~ 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 ""
+#~ "Bạn quên chưa chọn thư mục.\n"
+#~ "Vui lòng quay lại và chọn một thư mục hợp lệ để gửi thư tới."
+
+#~ msgid "at your earliest convenience"
+#~ msgstr "để tiện nhất cho bạn"
+
+#~ msgid "Type the name by which you would like to refer to this signature."
+#~ msgstr "Gõ tên mà bạn muốn dùng cho chữ ký này."
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Đang nhập %s\n"
+#~ "Bộ nhập chưa sẵn sàng\n"
+#~ "Đang đợi 5 giây trước khi thử lại."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Trợ tá bộ nhập Evolution"
+
+#~ msgid "_Preferences..."
+#~ msgstr "_Thông số..."
+
 #~ msgid "Card: "
 #~ msgstr "Card: "
 
@@ -28188,9 +28385,3 @@ msgstr "init_bonobo(): không thể khởi động Bonobo"
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr ""
 #~ "Không thể tìm thấy định danh của bạn trong danh sách người tham dự!\n"
-
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Thông tin rảnh/bận (%s tới %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "Thông tin iCalendar"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b849f52346..ca8de48077 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-02-04 22:51+0800\n"
 "Last-Translator: Wang Li <charlesw1234@163.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -680,17 +680,26 @@ msgstr "姓"
 msgid "%x"
 msgstr "%x"
 
+# addressbook/gui/component/select-names/e-select-names-popup.c:423
+# addressbook/gui/component/select-names/e-select-names-popup.c:423
+# addressbook/gui/component/select-names/e-select-names-popup.c:423
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "未命名的联系人列表"
+
 # addressbook/backend/ebook/e-card.c:4235
 # addressbook/backend/ebook/e-card.c:4235
 # addressbook/backend/ebook/e-card.c:4235
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "多个 VCard"
 
 # addressbook/backend/ebook/e-card.c:4243
 # addressbook/backend/ebook/e-card.c:4243
 # addressbook/backend/ebook/e-card.c:4243
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "%s 的 VCard"
@@ -735,9 +744,9 @@ msgstr "%s 的 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
@@ -750,22 +759,22 @@ msgstr "无法初始化 Bonobo"
 # addressbook/backend/pas/pas-backend-ldap.c:2269
 # addressbook/backend/pas/pas-backend-file.c:259
 # addressbook/backend/pas/pas-backend-ldap.c:2272
-#: addressbook/backend/pas/pas-backend-file.c: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:261
 # addressbook/backend/pas/pas-backend-file.c:261
 # addressbook/backend/pas/pas-backend-file.c:261
-#: 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:483
 # addressbook/backend/pas/pas-backend-ldap.c:483
 # addressbook/backend/pas/pas-backend-ldap.c:486
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "正在连接 LDAP 服务器..."
@@ -773,29 +782,29 @@ msgstr "正在连接 LDAP 服务器..."
 # addressbook/backend/pas/pas-backend-ldap.c:912
 # addressbook/backend/pas/pas-backend-ldap.c:912
 # addressbook/backend/pas/pas-backend-ldap.c:915
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "正在将卡片添加到 LDAP 服务器..."
 
 # addressbook/backend/pas/pas-backend-ldap.c:1013
 # addressbook/backend/pas/pas-backend-ldap.c:1013
 # addressbook/backend/pas/pas-backend-ldap.c:1016
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "正在从 LDAP 服务器删除卡片..."
 
 # addressbook/backend/pas/pas-backend-ldap.c:1123
 # addressbook/backend/pas/pas-backend-ldap.c:1123
 # addressbook/backend/pas/pas-backend-ldap.c:1126
-#: addressbook/backend/pas/pas-backend-ldap.c: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:2214
 # addressbook/backend/pas/pas-backend-ldap.c:2214
 # addressbook/backend/pas/pas-backend-ldap.c:2217
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 的搜索结果..."
 
@@ -805,7 +814,7 @@ msgstr "正在接收 LDAP 的搜索结果..."
 # addressbook/gui/widgets/e-addressbook-view.c:1278
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "删除卡片错误"
@@ -842,7 +851,7 @@ msgstr "没有装入 EBook\n"
 # calendar/conduits/calendar/calendar-conduit.c:1203
 # calendar/conduits/todo/todo-conduit.c:824
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "无法启动 wombat 服务器"
@@ -857,7 +866,7 @@ msgstr "无法启动 wombat 服务器"
 # calendar/conduits/calendar/calendar-conduit.c:1204
 # calendar/conduits/todo/todo-conduit.c:825
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "无法启动 wombat"
@@ -973,10 +982,10 @@ msgstr "示例地址簿控制车间"
 # calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
 # shell/e-shortcuts.c:1061
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c: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 "联系人"
@@ -1002,27 +1011,52 @@ msgstr "LDAP 服务器"
 msgid "LDAP server containing contact information"
 msgstr "含有联系人信息的 LDAP 服务器"
 
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "联系人"
+
+# addressbook/gui/component/addressbook-component.c:71
+# addressbook/gui/component/addressbook-component.c:71
+# addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "含有联系人信息的文件夹"
+
 # addressbook/gui/component/addressbook-component.c:526
 # ui/evolution-addressbook.xml.h:11
 # addressbook/gui/component/addressbook-component.c:526
 # ui/evolution-addressbook.xml.h:11
 # addressbook/gui/component/addressbook-component.c:527
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "新建联系人"
 
 # ui/evolution-addressbook.xml.h:31
 # ui/evolution-addressbook.xml.h:31
 # ui/evolution-addressbook.xml.h:32
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "联系人(_C)"
 
 # ui/evolution-addressbook.xml.h:4
 # ui/evolution-addressbook.xml.h:4
 # ui/evolution-addressbook.xml.h:4
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "创建新的联系人"
@@ -1030,14 +1064,14 @@ msgstr "创建新的联系人"
 # addressbook/gui/component/addressbook-component.c:527
 # addressbook/gui/component/addressbook-component.c:527
 # addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "新建联系人列表"
 
 # ui/evolution-addressbook.xml.h:32
 # ui/evolution-addressbook.xml.h:32
 # ui/evolution-addressbook.xml.h:33
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "联系人列表(_C)"
@@ -1045,7 +1079,7 @@ msgstr "联系人列表(_C)"
 # ui/evolution-addressbook.xml.h:5
 # ui/evolution-addressbook.xml.h:5
 # ui/evolution-addressbook.xml.h:5
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "创建新的联系人列表"
@@ -1114,7 +1148,7 @@ msgstr "(在该版本的 evolution 中不支持SSL)"
 # addressbook/gui/component/addressbook-factory.c:70
 # calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c: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"
 
@@ -1128,14 +1162,14 @@ msgstr "其他联系人"
 # addressbook/gui/component/addressbook.c:485
 # addressbook/gui/component/addressbook.c:485
 # addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "无法打开地址簿"
 
 # addressbook/gui/component/addressbook.c:507
 # addressbook/gui/component/addressbook.c:507
 # addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c: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."
@@ -1146,7 +1180,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -1160,7 +1194,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:499
 # addressbook/gui/component/addressbook.c:499
 # addressbook/gui/component/addressbook.c:513
-#: addressbook/gui/component/addressbook.c: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"
@@ -1175,7 +1209,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -1186,22 +1220,38 @@ msgstr ""
 "您输入了错误的 URI，或是是因为\n"
 " LDAP 服务器已经关闭"
 
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+# camel/providers/imap/camel-imap-store.c:596
+# camel/providers/imap/camel-imap-store.c:596
+# camel/providers/imap/camel-imap-store.c:596
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"无法认证到 IMAP 服务器。\n"
+"%s\n"
+"\n"
+
 # addressbook/gui/component/addressbook.c:640
 # addressbook/gui/component/addressbook.c:640
 # addressbook/gui/component/addressbook.c:655
 # addressbook/gui/component/addressbook.c:658
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#: 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 "以之结束"
@@ -1212,7 +1262,7 @@ msgstr "以之结束"
 # calendar/gui/cal-search-bar.c:59
 # addressbook/gui/component/addressbook.c:839
 # calendar/gui/cal-search-bar.c:59
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "类别为"
@@ -1224,7 +1274,7 @@ msgstr "类别为"
 # addressbook/gui/component/addressbook.c:836
 # calendar/gui/cal-search-bar.c:55
 #. 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 "任何域含有"
@@ -1234,11 +1284,11 @@ msgstr "任何域含有"
 # widgets/misc/e-filter-bar.h:104
 # addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c: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"
@@ -1246,7 +1296,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"
@@ -1254,15 +1304,15 @@ 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 ""
 
@@ -1273,7 +1323,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:1067
 # calendar/gui/cal-search-bar.c:412
 #. 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 "任何类别"
@@ -1281,7 +1331,7 @@ msgstr "任何类别"
 # addressbook/gui/component/addressbook.c:1107
 # addressbook/gui/component/addressbook.c:1107
 # addressbook/gui/component/addressbook.c:1150
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "文件夹浏览器将显示的 URI"
 
@@ -1401,46 +1451,30 @@ msgstr "开启查询(危险！)"
 msgid "  S_how Supported Bases "
 msgstr "检查支持的类型(_C) "
 
-# addressbook/printing/e-contact-print.glade.h:23
-# addressbook/printing/e-contact-print.glade.h:23
-# addressbook/printing/e-contact-print.glade.h:23
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "选项"
-
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "删除(_R)"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
 # calendar/gui/e-calendar-table.c:437
 # calendar/gui/e-calendar-table.c:437
 # addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h: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 ""
 
 # calendar/gui/e-calendar-table.c:435
 # calendar/gui/e-calendar-table.c:435
 # calendar/gui/e-calendar-table.c:436
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "80%"
@@ -1448,22 +1482,41 @@ msgstr "80%"
 # addressbook/gui/component/addressbook-config.glade.h:1
 # addressbook/gui/component/addressbook-config.glade.h:1
 # addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h: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/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "删除(_R)"
+
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "选项"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -1650,6 +1703,12 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
+"Please select an Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:47
+msgid ""
 "Please select and Evolution attribute and an\n"
 "LDAP attribute to associate with it."
 msgstr ""
@@ -1657,7 +1716,7 @@ msgstr ""
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "R_estore Defaults"
 msgstr "默认"
@@ -1665,7 +1724,7 @@ msgstr "默认"
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "默认"
@@ -1673,7 +1732,7 @@ msgstr "默认"
 # addressbook/gui/component/addressbook-config.glade.h:13
 # addressbook/gui/component/addressbook-config.glade.h:13
 # addressbook/gui/component/addressbook-config.glade.h:18
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "搜索范围(_C)："
@@ -1685,33 +1744,33 @@ msgstr "搜索范围(_C)："
 # calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
 # calendar/gui/e-week-view.c:1188
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h: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 "搜索"
 
 # ui/evolution-addressbook.xml.h:21
 # ui/evolution-addressbook.xml.h:21
 # ui/evolution-addressbook.xml.h:21
-#: addressbook/gui/component/ldap-config.glade.h: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"
@@ -1722,7 +1781,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"
@@ -1731,14 +1790,14 @@ 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."
@@ -1747,7 +1806,7 @@ msgstr ""
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:90
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "来源信息"
@@ -1755,35 +1814,35 @@ msgstr "来源信息"
 # mail/mail-config.c:2184 mail/mail-config.c:2188
 # mail/mail-config.c:2233 mail/mail-config.c:2237
 # mail/mail-config.c:2326 mail/mail-config.c:2330
-#: addressbook/gui/component/ldap-config.glade.h: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/addressbook-config.glade.h:15
 # addressbook/gui/component/addressbook-config.glade.h:15
 # addressbook/gui/component/addressbook-config.glade.h:20
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr ""
 
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1036
-#: addressbook/gui/component/ldap-config.glade.h: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"
@@ -1791,7 +1850,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"
@@ -1800,7 +1859,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"
@@ -1808,7 +1867,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"
@@ -1818,7 +1877,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"
@@ -1828,14 +1887,14 @@ 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/addressbook-config.glade.h:25
-#: 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 "
@@ -1844,7 +1903,7 @@ msgid ""
 msgstr "这是可下载卡片的最大数量。将该数值设定得太大将导致地址本变慢。"
 
 # addressbook/gui/component/addressbook-config.glade.h:26
-#: 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 "
@@ -1856,7 +1915,7 @@ msgstr ""
 # addressbook/gui/component/addressbook-config.glade.h:22
 # addressbook/gui/component/addressbook-config.glade.h:22
 # addressbook/gui/component/addressbook-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h: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 "
@@ -1864,7 +1923,7 @@ msgid ""
 "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"
@@ -1872,11 +1931,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"
@@ -1885,12 +1944,12 @@ 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/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "识别姓名 (DN)"
@@ -1898,12 +1957,12 @@ msgstr "识别姓名 (DN)"
 # addressbook/gui/component/addressbook-config.glade.h:9
 # addressbook/gui/component/addressbook-config.glade.h:9
 # addressbook/gui/component/addressbook-config.glade.h:13
-#: addressbook/gui/component/ldap-config.glade.h: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 ""
@@ -1923,7 +1982,7 @@ msgstr ""
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 # calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
 # mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h: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
@@ -1946,17 +2005,17 @@ msgstr "添加(_A)"
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 # calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
 # mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "添加(_A)"
 
-#: 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 "添加动作"
@@ -1964,7 +2023,7 @@ msgstr "添加动作"
 # calendar/gui/e-calendar-table.etspec.h:3
 # calendar/gui/e-calendar-table.etspec.h:3
 # calendar/gui/e-calendar-table.etspec.h:3
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "提醒"
@@ -1972,7 +2031,7 @@ msgstr "提醒"
 # ui/evolution-message-composer.xml.h:46
 # ui/evolution-message-composer.xml.h:46
 # ui/evolution-message-composer.xml.h:46
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "全部删除(_D)"
@@ -1980,23 +2039,23 @@ msgstr "全部删除(_D)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "显示(_D)"
 
 # addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "识别姓名 (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/addressbook-config.glade.h:33
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Download limit:"
 msgstr "下载上限(_D)"
@@ -2019,7 +2078,7 @@ msgstr "下载上限(_D)"
 # ui/evolution-message-composer.xml.h:47
 # ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 # ui/evolution-tasks.xml.h:19
-#: addressbook/gui/component/ldap-config.glade.h: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
@@ -2032,7 +2091,7 @@ msgstr "编辑(_E)"
 # calendar/gui/alarm-notify/alarm-notify.glade.h:4
 # calendar/gui/alarm-notify/alarm-notify.glade.h:4
 # calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "编辑约会(_E)"
@@ -2040,39 +2099,39 @@ msgstr "编辑约会(_E)"
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: addressbook/gui/component/ldap-config.glade.h: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 ""
 
 # calendar/gui/e-meeting-time-sel.c:467
 # calendar/gui/e-meeting-time-sel.c:470
 # calendar/gui/e-meeting-time-sel.c:470
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "选项(_O)"
 
 # addressbook/gui/component/addressbook-config.glade.h:27
 # addressbook/gui/component/addressbook-config.glade.h:27
 # addressbook/gui/component/addressbook-config.glade.h:36
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "端口(_P)："
@@ -2080,7 +2139,7 @@ msgstr "端口(_P)："
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "默认"
@@ -2088,7 +2147,7 @@ msgstr "默认"
 # addressbook/gui/component/addressbook-config.glade.h:12
 # addressbook/gui/component/addressbook-config.glade.h:12
 # addressbook/gui/component/addressbook-config.glade.h:17
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "搜索起点(_B)："
@@ -2096,14 +2155,14 @@ msgstr "搜索起点(_B)："
 # addressbook/gui/component/addressbook-config.glade.h:28
 # addressbook/gui/component/addressbook-config.glade.h:28
 # addressbook/gui/component/addressbook-config.glade.h:37
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "服务器名(_S)："
 
 # calendar/gui/alarm-notify/alarm-notify.glade.h:3
 # calendar/gui/alarm-notify/alarm-notify.glade.h:3
 # calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "午睡时间(分钟)"
@@ -2111,7 +2170,7 @@ msgstr "午睡时间(分钟)"
 # mail/mail-config.c:326
 # mail/mail-config.c:329
 # mail/mail-config.c:354
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "帐号 %d"
@@ -2119,7 +2178,7 @@ msgstr "帐号 %d"
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "联系人列表编辑器"
@@ -2127,7 +2186,7 @@ msgstr "联系人列表编辑器"
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "没有卡片"
@@ -2135,32 +2194,32 @@ msgstr "没有卡片"
 # mail/mail-ops.c:2089
 # mail/mail-ops.c:2091
 # mail/mail-ops.c:2134
-#: 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/contact-editor/contact-editor.glade.h:16
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h: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 ""
 
@@ -2170,7 +2229,7 @@ msgstr ""
 # calendar/gui/e-week-view.c:1184
 # calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
 # calendar/gui/e-week-view.c:1188
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "搜索"
@@ -2200,8 +2259,8 @@ msgstr "地址簿名称选择界面车间"
 # composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c: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"
@@ -2253,14 +2312,14 @@ msgstr "未命名的联系人"
 # addressbook/gui/component/select-names/e-select-names.c:608
 # addressbook/gui/component/select-names/e-select-names.c:608
 # addressbook/gui/component/select-names/e-select-names.c:671
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "从地址簿中选择联系人"
 
 # default_user/searches.xml.h:6
 # default_user/searches.xml.h:6
 # default_user/searches.xml.h:6
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "发件人含有"
@@ -2400,7 +2459,7 @@ msgstr "部门(_E)："
 # addressbook/gui/contact-editor/contact-editor.glade.h:12
 # calendar/gui/dialogs/task-editor.c:183
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "细节"
 
@@ -2511,13 +2570,13 @@ msgstr "愿意接收 HTML 邮件(_H)"
 # ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c: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 "删除(_D)"
 
@@ -2567,7 +2626,7 @@ msgstr "网页地址(_W)："
 # addressbook/gui/contact-editor/fulladdr.glade.h:224
 # addressbook/gui/contact-editor/e-contact-editor-address.c:128
 # my-evolution/Locations.h:2343
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "美国"
@@ -2575,7 +2634,7 @@ msgstr "美国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:2
 # addressbook/gui/contact-editor/fulladdr.glade.h:2
 # addressbook/gui/contact-editor/e-contact-editor-address.c:129
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "阿富汗"
 
@@ -2583,7 +2642,7 @@ msgstr "阿富汗"
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # addressbook/gui/contact-editor/e-contact-editor-address.c:130
 # my-evolution/Locations.h:42
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "阿尔巴尼亚"
@@ -2592,7 +2651,7 @@ msgstr "阿尔巴尼亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:4
 # addressbook/gui/contact-editor/e-contact-editor-address.c:131
 # my-evolution/Locations.h:54
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "阿尔及利亚"
@@ -2600,42 +2659,42 @@ msgstr "阿尔及利亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # addressbook/gui/contact-editor/e-contact-editor-address.c:132
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "美洲萨摩亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:6
 # addressbook/gui/contact-editor/fulladdr.glade.h:6
 # addressbook/gui/contact-editor/e-contact-editor-address.c:133
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "安道尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:7
 # addressbook/gui/contact-editor/fulladdr.glade.h:7
 # addressbook/gui/contact-editor/e-contact-editor-address.c:134
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "安哥拉"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:8
 # addressbook/gui/contact-editor/fulladdr.glade.h:8
 # addressbook/gui/contact-editor/e-contact-editor-address.c:135
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "安圭拉"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:9
 # addressbook/gui/contact-editor/fulladdr.glade.h:9
 # addressbook/gui/contact-editor/e-contact-editor-address.c:136
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "南极洲"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:10
 # addressbook/gui/contact-editor/fulladdr.glade.h:10
 # addressbook/gui/contact-editor/e-contact-editor-address.c:137
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr "安提瓜和巴布达"
 
@@ -2643,7 +2702,7 @@ msgstr "安提瓜和巴布达"
 # addressbook/gui/contact-editor/fulladdr.glade.h:11
 # addressbook/gui/contact-editor/e-contact-editor-address.c:138
 # my-evolution/Locations.h:120
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "阿根廷"
@@ -2651,14 +2710,14 @@ msgstr "阿根廷"
 # addressbook/gui/contact-editor/fulladdr.glade.h:12
 # addressbook/gui/contact-editor/fulladdr.glade.h:12
 # addressbook/gui/contact-editor/e-contact-editor-address.c:139
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "亚美尼亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:13
 # addressbook/gui/contact-editor/fulladdr.glade.h:13
 # addressbook/gui/contact-editor/e-contact-editor-address.c:140
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "阿鲁巴岛"
 
@@ -2666,7 +2725,7 @@ msgstr "阿鲁巴岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # addressbook/gui/contact-editor/e-contact-editor-address.c:141
 # my-evolution/Locations.h:154
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "澳大利亚"
@@ -2675,7 +2734,7 @@ msgstr "澳大利亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:15
 # addressbook/gui/contact-editor/e-contact-editor-address.c:142
 # my-evolution/Locations.h:155
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "奥地利"
@@ -2683,7 +2742,7 @@ msgstr "奥地利"
 # addressbook/gui/contact-editor/fulladdr.glade.h:16
 # addressbook/gui/contact-editor/fulladdr.glade.h:16
 # addressbook/gui/contact-editor/e-contact-editor-address.c:143
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "阿塞拜疆"
 
@@ -2691,7 +2750,7 @@ msgstr "阿塞拜疆"
 # addressbook/gui/contact-editor/fulladdr.glade.h:17
 # addressbook/gui/contact-editor/e-contact-editor-address.c:144
 # my-evolution/Locations.h:161
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "巴哈马群岛"
@@ -2700,7 +2759,7 @@ msgstr "巴哈马群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:18
 # addressbook/gui/contact-editor/e-contact-editor-address.c:145
 # my-evolution/Locations.h:164
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "巴林岛"
@@ -2708,21 +2767,21 @@ msgstr "巴林岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:19
 # addressbook/gui/contact-editor/fulladdr.glade.h:19
 # addressbook/gui/contact-editor/e-contact-editor-address.c:146
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "孟加拉国"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:20
 # addressbook/gui/contact-editor/fulladdr.glade.h:20
 # addressbook/gui/contact-editor/e-contact-editor-address.c:147
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "巴巴多斯岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:21
 # addressbook/gui/contact-editor/fulladdr.glade.h:21
 # addressbook/gui/contact-editor/e-contact-editor-address.c:148
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "白俄罗斯"
 
@@ -2730,7 +2789,7 @@ msgstr "白俄罗斯"
 # addressbook/gui/contact-editor/fulladdr.glade.h:22
 # addressbook/gui/contact-editor/e-contact-editor-address.c:149
 # my-evolution/Locations.h:216
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "比利时"
@@ -2739,7 +2798,7 @@ msgstr "比利时"
 # addressbook/gui/contact-editor/fulladdr.glade.h:23
 # addressbook/gui/contact-editor/e-contact-editor-address.c:150
 # my-evolution/Locations.h:218
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "伯利兹"
@@ -2747,21 +2806,21 @@ msgstr "伯利兹"
 # addressbook/gui/contact-editor/fulladdr.glade.h:24
 # addressbook/gui/contact-editor/fulladdr.glade.h:24
 # addressbook/gui/contact-editor/e-contact-editor-address.c:151
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Benin"
 msgstr "贝宁"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:25
 # addressbook/gui/contact-editor/fulladdr.glade.h:25
 # addressbook/gui/contact-editor/e-contact-editor-address.c:152
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "百慕大群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:26
 # addressbook/gui/contact-editor/fulladdr.glade.h:26
 # addressbook/gui/contact-editor/e-contact-editor-address.c:153
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "不丹"
 
@@ -2769,7 +2828,7 @@ msgstr "不丹"
 # addressbook/gui/contact-editor/fulladdr.glade.h:27
 # addressbook/gui/contact-editor/e-contact-editor-address.c:154
 # my-evolution/Locations.h:270
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "玻利维亚"
@@ -2777,21 +2836,21 @@ msgstr "玻利维亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:28
 # addressbook/gui/contact-editor/fulladdr.glade.h:28
 # addressbook/gui/contact-editor/e-contact-editor-address.c:155
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "波斯尼亚和黑赛哥维纳"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:29
 # addressbook/gui/contact-editor/fulladdr.glade.h:29
 # addressbook/gui/contact-editor/e-contact-editor-address.c:156
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "博茨瓦纳"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:30
 # addressbook/gui/contact-editor/fulladdr.glade.h:30
 # addressbook/gui/contact-editor/e-contact-editor-address.c:157
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "布维岛"
 
@@ -2799,7 +2858,7 @@ msgstr "布维岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:31
 # addressbook/gui/contact-editor/e-contact-editor-address.c:158
 # my-evolution/Locations.h:294
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "巴西"
@@ -2807,14 +2866,14 @@ msgstr "巴西"
 # addressbook/gui/contact-editor/fulladdr.glade.h:32
 # addressbook/gui/contact-editor/fulladdr.glade.h:32
 # addressbook/gui/contact-editor/e-contact-editor-address.c:159
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "英属印度洋地区"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:34
 # addressbook/gui/contact-editor/fulladdr.glade.h:34
 # addressbook/gui/contact-editor/e-contact-editor-address.c:160
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "文莱 德鲁萨兰"
 
@@ -2822,7 +2881,7 @@ msgstr "文莱 德鲁萨兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:35
 # addressbook/gui/contact-editor/e-contact-editor-address.c:161
 # my-evolution/Locations.h:320
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "保加利亚"
@@ -2830,28 +2889,28 @@ msgstr "保加利亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:36
 # addressbook/gui/contact-editor/fulladdr.glade.h:36
 # addressbook/gui/contact-editor/e-contact-editor-address.c:162
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Burkina Faso"
 msgstr "布基纳法索"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:37
 # addressbook/gui/contact-editor/fulladdr.glade.h:37
 # addressbook/gui/contact-editor/e-contact-editor-address.c:163
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burundi"
 msgstr "布隆迪"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:38
 # addressbook/gui/contact-editor/fulladdr.glade.h:38
 # addressbook/gui/contact-editor/e-contact-editor-address.c:164
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "柬埔寨"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:39
 # addressbook/gui/contact-editor/fulladdr.glade.h:39
 # addressbook/gui/contact-editor/e-contact-editor-address.c:165
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "喀麦隆"
 
@@ -2859,7 +2918,7 @@ msgstr "喀麦隆"
 # addressbook/gui/contact-editor/fulladdr.glade.h:40
 # addressbook/gui/contact-editor/e-contact-editor-address.c:166
 # my-evolution/Locations.h:354
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "加拿大"
@@ -2867,7 +2926,7 @@ msgstr "加拿大"
 # addressbook/gui/contact-editor/fulladdr.glade.h:41
 # addressbook/gui/contact-editor/fulladdr.glade.h:41
 # addressbook/gui/contact-editor/e-contact-editor-address.c:167
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr "佛得角"
 
@@ -2875,7 +2934,7 @@ msgstr "佛得角"
 # addressbook/gui/contact-editor/fulladdr.glade.h:42
 # addressbook/gui/contact-editor/e-contact-editor-address.c:168
 # my-evolution/Locations.h:389
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "开曼群岛"
@@ -2883,14 +2942,14 @@ msgstr "开曼群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:43
 # addressbook/gui/contact-editor/fulladdr.glade.h:43
 # addressbook/gui/contact-editor/e-contact-editor-address.c:169
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "中非共和国"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:44
 # addressbook/gui/contact-editor/fulladdr.glade.h:44
 # addressbook/gui/contact-editor/e-contact-editor-address.c:170
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "乍得"
 
@@ -2898,7 +2957,7 @@ msgstr "乍得"
 # addressbook/gui/contact-editor/fulladdr.glade.h:46
 # addressbook/gui/contact-editor/e-contact-editor-address.c:171
 # my-evolution/Locations.h:438
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "智利"
@@ -2906,7 +2965,7 @@ msgstr "智利"
 # addressbook/gui/contact-editor/fulladdr.glade.h:47
 # addressbook/gui/contact-editor/fulladdr.glade.h:47
 # addressbook/gui/contact-editor/e-contact-editor-address.c:172
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "中国"
 
@@ -2914,7 +2973,7 @@ msgstr "中国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:48
 # addressbook/gui/contact-editor/e-contact-editor-address.c:173
 # my-evolution/Locations.h:451
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "圣诞岛"
@@ -2922,7 +2981,7 @@ msgstr "圣诞岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:49
 # addressbook/gui/contact-editor/fulladdr.glade.h:49
 # addressbook/gui/contact-editor/e-contact-editor-address.c:174
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "科科斯群岛"
 
@@ -2930,7 +2989,7 @@ msgstr "科科斯群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:50
 # addressbook/gui/contact-editor/e-contact-editor-address.c:175
 # my-evolution/Locations.h:483
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "哥伦比亚"
@@ -2938,7 +2997,7 @@ msgstr "哥伦比亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:51
 # addressbook/gui/contact-editor/fulladdr.glade.h:51
 # addressbook/gui/contact-editor/e-contact-editor-address.c:176
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "科摩罗群岛"
 
@@ -2946,15 +3005,15 @@ msgstr "科摩罗群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:52
 # addressbook/gui/contact-editor/e-contact-editor-address.c:177
 # addressbook/gui/contact-editor/e-contact-editor-address.c:178
-#: addressbook/gui/contact-editor/e-contact-editor-address.c: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/fulladdr.glade.h:53
 # addressbook/gui/contact-editor/fulladdr.glade.h:53
 # addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "库克群岛"
 
@@ -2962,7 +3021,7 @@ msgstr "库克群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:54
 # addressbook/gui/contact-editor/e-contact-editor-address.c:180
 # my-evolution/Locations.h:517
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
@@ -2970,7 +3029,7 @@ msgstr "哥斯达黎加"
 # addressbook/gui/contact-editor/fulladdr.glade.h:55
 # addressbook/gui/contact-editor/fulladdr.glade.h:55
 # addressbook/gui/contact-editor/e-contact-editor-address.c:181
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "科特迪瓦"
 
@@ -2978,7 +3037,7 @@ msgstr "科特迪瓦"
 # addressbook/gui/contact-editor/fulladdr.glade.h:57
 # addressbook/gui/contact-editor/e-contact-editor-address.c:182
 # my-evolution/Locations.h:528
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "克罗地亚"
@@ -2987,7 +3046,7 @@ msgstr "克罗地亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:58
 # addressbook/gui/contact-editor/e-contact-editor-address.c:183
 # my-evolution/Locations.h:532
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "古巴"
@@ -2996,7 +3055,7 @@ msgstr "古巴"
 # addressbook/gui/contact-editor/fulladdr.glade.h:59
 # addressbook/gui/contact-editor/e-contact-editor-address.c:184
 # my-evolution/Locations.h:545
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "塞浦路斯"
@@ -3005,7 +3064,7 @@ msgstr "塞浦路斯"
 # addressbook/gui/contact-editor/fulladdr.glade.h:60
 # addressbook/gui/contact-editor/e-contact-editor-address.c:185
 # my-evolution/Locations.h:546
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "捷克共和国"
@@ -3014,7 +3073,7 @@ msgstr "捷克共和国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:61
 # addressbook/gui/contact-editor/e-contact-editor-address.c:186
 # my-evolution/Locations.h:580
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "丹麦"
@@ -3022,14 +3081,14 @@ msgstr "丹麦"
 # addressbook/gui/contact-editor/fulladdr.glade.h:62
 # addressbook/gui/contact-editor/fulladdr.glade.h:62
 # addressbook/gui/contact-editor/e-contact-editor-address.c:187
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "吉布提群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:63
 # addressbook/gui/contact-editor/fulladdr.glade.h:63
 # addressbook/gui/contact-editor/e-contact-editor-address.c:188
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "多米尼加"
 
@@ -3037,7 +3096,7 @@ msgstr "多米尼加"
 # addressbook/gui/contact-editor/fulladdr.glade.h:64
 # addressbook/gui/contact-editor/e-contact-editor-address.c:189
 # my-evolution/Locations.h:608
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "多米尼加共和国"
@@ -3045,7 +3104,7 @@ msgstr "多米尼加共和国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:65
 # addressbook/gui/contact-editor/fulladdr.glade.h:65
 # addressbook/gui/contact-editor/e-contact-editor-address.c:190
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "东帝汶"
 
@@ -3053,7 +3112,7 @@ msgstr "东帝汶"
 # addressbook/gui/contact-editor/fulladdr.glade.h:66
 # addressbook/gui/contact-editor/e-contact-editor-address.c:191
 # my-evolution/Locations.h:641
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "厄瓜多尔"
@@ -3062,7 +3121,7 @@ msgstr "厄瓜多尔"
 # addressbook/gui/contact-editor/fulladdr.glade.h:67
 # addressbook/gui/contact-editor/e-contact-editor-address.c:192
 # my-evolution/Locations.h:650
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "埃及"
@@ -3071,7 +3130,7 @@ msgstr "埃及"
 # addressbook/gui/contact-editor/fulladdr.glade.h:68
 # addressbook/gui/contact-editor/e-contact-editor-address.c:193
 # my-evolution/Locations.h:666
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "萨尔瓦多"
@@ -3079,14 +3138,14 @@ msgstr "萨尔瓦多"
 # addressbook/gui/contact-editor/fulladdr.glade.h:69
 # addressbook/gui/contact-editor/fulladdr.glade.h:69
 # addressbook/gui/contact-editor/e-contact-editor-address.c:194
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "赤道几内亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:70
 # addressbook/gui/contact-editor/fulladdr.glade.h:70
 # addressbook/gui/contact-editor/e-contact-editor-address.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "厄立特里亚"
 
@@ -3094,7 +3153,7 @@ msgstr "厄立特里亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:71
 # addressbook/gui/contact-editor/e-contact-editor-address.c:196
 # my-evolution/Locations.h:684
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "爱沙尼亚"
@@ -3102,28 +3161,28 @@ msgstr "爱沙尼亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:72
 # addressbook/gui/contact-editor/fulladdr.glade.h:72
 # addressbook/gui/contact-editor/e-contact-editor-address.c:197
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "埃塞俄比亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:73
 # addressbook/gui/contact-editor/fulladdr.glade.h:73
 # addressbook/gui/contact-editor/e-contact-editor-address.c:198
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "福克兰群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:74
 # addressbook/gui/contact-editor/fulladdr.glade.h:74
 # addressbook/gui/contact-editor/e-contact-editor-address.c:199
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "法罗群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:75
 # addressbook/gui/contact-editor/fulladdr.glade.h:75
 # addressbook/gui/contact-editor/e-contact-editor-address.c:200
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "斐济"
 
@@ -3131,7 +3190,7 @@ msgstr "斐济"
 # addressbook/gui/contact-editor/fulladdr.glade.h:76
 # addressbook/gui/contact-editor/e-contact-editor-address.c:201
 # my-evolution/Locations.h:716
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "芬兰"
@@ -3140,7 +3199,7 @@ msgstr "芬兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:77
 # addressbook/gui/contact-editor/e-contact-editor-address.c:202
 # my-evolution/Locations.h:766
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "法国"
@@ -3148,35 +3207,35 @@ msgstr "法国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:78
 # addressbook/gui/contact-editor/fulladdr.glade.h:78
 # addressbook/gui/contact-editor/e-contact-editor-address.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "法属圭亚那"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:79
 # addressbook/gui/contact-editor/fulladdr.glade.h:79
 # addressbook/gui/contact-editor/e-contact-editor-address.c:204
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "法属波利尼西亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:80
 # addressbook/gui/contact-editor/fulladdr.glade.h:80
 # addressbook/gui/contact-editor/e-contact-editor-address.c:205
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "法属南部地区"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:81
 # addressbook/gui/contact-editor/fulladdr.glade.h:81
 # addressbook/gui/contact-editor/e-contact-editor-address.c:206
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "加蓬"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:82
 # addressbook/gui/contact-editor/fulladdr.glade.h:82
 # addressbook/gui/contact-editor/e-contact-editor-address.c:207
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "冈比亚"
 
@@ -3184,7 +3243,7 @@ msgstr "冈比亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:83
 # addressbook/gui/contact-editor/e-contact-editor-address.c:208
 # my-evolution/Locations.h:811
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "格鲁吉亚"
@@ -3193,7 +3252,7 @@ msgstr "格鲁吉亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:84
 # addressbook/gui/contact-editor/e-contact-editor-address.c:209
 # my-evolution/Locations.h:812
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "德国"
@@ -3201,7 +3260,7 @@ msgstr "德国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:85
 # addressbook/gui/contact-editor/fulladdr.glade.h:85
 # addressbook/gui/contact-editor/e-contact-editor-address.c:210
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "加纳"
 
@@ -3209,7 +3268,7 @@ msgstr "加纳"
 # addressbook/gui/contact-editor/fulladdr.glade.h:86
 # addressbook/gui/contact-editor/e-contact-editor-address.c:211
 # my-evolution/Locations.h:815
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "直布罗陀"
@@ -3218,7 +3277,7 @@ msgstr "直布罗陀"
 # addressbook/gui/contact-editor/fulladdr.glade.h:87
 # addressbook/gui/contact-editor/e-contact-editor-address.c:212
 # my-evolution/Locations.h:846
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "希腊"
@@ -3226,28 +3285,28 @@ msgstr "希腊"
 # addressbook/gui/contact-editor/fulladdr.glade.h:88
 # addressbook/gui/contact-editor/fulladdr.glade.h:88
 # addressbook/gui/contact-editor/e-contact-editor-address.c:213
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "格陵兰"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # addressbook/gui/contact-editor/e-contact-editor-address.c:214
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "格林纳达"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:90
 # addressbook/gui/contact-editor/fulladdr.glade.h:90
 # addressbook/gui/contact-editor/e-contact-editor-address.c:215
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "瓜德罗普岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:91
 # addressbook/gui/contact-editor/fulladdr.glade.h:91
 # addressbook/gui/contact-editor/e-contact-editor-address.c:216
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "关岛"
 
@@ -3255,7 +3314,7 @@ msgstr "关岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:92
 # addressbook/gui/contact-editor/e-contact-editor-address.c:217
 # my-evolution/Locations.h:867
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "危地马拉"
@@ -3263,21 +3322,21 @@ msgstr "危地马拉"
 # addressbook/gui/contact-editor/fulladdr.glade.h:93
 # addressbook/gui/contact-editor/fulladdr.glade.h:93
 # addressbook/gui/contact-editor/e-contact-editor-address.c:218
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "几内亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:94
 # addressbook/gui/contact-editor/fulladdr.glade.h:94
 # addressbook/gui/contact-editor/e-contact-editor-address.c:219
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "几内亚比绍"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:95
 # addressbook/gui/contact-editor/fulladdr.glade.h:95
 # addressbook/gui/contact-editor/e-contact-editor-address.c:220
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "圭亚那"
 
@@ -3285,7 +3344,7 @@ msgstr "圭亚那"
 # addressbook/gui/contact-editor/fulladdr.glade.h:96
 # addressbook/gui/contact-editor/e-contact-editor-address.c:221
 # my-evolution/Locations.h:888
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "海地"
@@ -3293,14 +3352,14 @@ msgstr "海地"
 # addressbook/gui/contact-editor/fulladdr.glade.h:97
 # addressbook/gui/contact-editor/fulladdr.glade.h:97
 # addressbook/gui/contact-editor/e-contact-editor-address.c:222
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Heard And McDonald Islands"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:98
 # addressbook/gui/contact-editor/fulladdr.glade.h:98
 # addressbook/gui/contact-editor/e-contact-editor-address.c:223
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "圣座"
 
@@ -3308,7 +3367,7 @@ msgstr "圣座"
 # addressbook/gui/contact-editor/fulladdr.glade.h:99
 # addressbook/gui/contact-editor/e-contact-editor-address.c:224
 # my-evolution/Locations.h:945
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "洪都拉斯"
@@ -3317,7 +3376,7 @@ msgstr "洪都拉斯"
 # addressbook/gui/contact-editor/fulladdr.glade.h:100
 # addressbook/gui/contact-editor/e-contact-editor-address.c:225
 # my-evolution/Locations.h:946
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "香港"
@@ -3326,7 +3385,7 @@ msgstr "香港"
 # addressbook/gui/contact-editor/fulladdr.glade.h:101
 # addressbook/gui/contact-editor/e-contact-editor-address.c:226
 # my-evolution/Locations.h:966
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "匈牙利"
@@ -3335,7 +3394,7 @@ msgstr "匈牙利"
 # addressbook/gui/contact-editor/fulladdr.glade.h:102
 # addressbook/gui/contact-editor/e-contact-editor-address.c:227
 # my-evolution/Locations.h:978
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "冰岛"
@@ -3344,7 +3403,7 @@ msgstr "冰岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:103
 # addressbook/gui/contact-editor/e-contact-editor-address.c:228
 # my-evolution/Locations.h:991
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "印度"
@@ -3352,7 +3411,7 @@ msgstr "印度"
 # addressbook/gui/contact-editor/fulladdr.glade.h:104
 # addressbook/gui/contact-editor/fulladdr.glade.h:104
 # addressbook/gui/contact-editor/e-contact-editor-address.c:229
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "印度尼西亚"
 
@@ -3360,7 +3419,7 @@ msgstr "印度尼西亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # addressbook/gui/contact-editor/e-contact-editor-address.c:230
 # my-evolution/Locations.h:1007
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "爱尔兰"
@@ -3368,7 +3427,7 @@ msgstr "爱尔兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:106
 # addressbook/gui/contact-editor/fulladdr.glade.h:106
 # addressbook/gui/contact-editor/e-contact-editor-address.c:231
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "以色列"
 
@@ -3376,7 +3435,7 @@ msgstr "以色列"
 # addressbook/gui/contact-editor/fulladdr.glade.h:107
 # addressbook/gui/contact-editor/e-contact-editor-address.c:232
 # my-evolution/Locations.h:1016
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "意大利"
@@ -3385,7 +3444,7 @@ msgstr "意大利"
 # addressbook/gui/contact-editor/fulladdr.glade.h:108
 # addressbook/gui/contact-editor/e-contact-editor-address.c:233
 # my-evolution/Locations.h:1031
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "牙买加"
@@ -3394,7 +3453,7 @@ msgstr "牙买加"
 # addressbook/gui/contact-editor/fulladdr.glade.h:109
 # addressbook/gui/contact-editor/e-contact-editor-address.c:234
 # my-evolution/Locations.h:1035
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "日本"
@@ -3403,7 +3462,7 @@ msgstr "日本"
 # addressbook/gui/contact-editor/fulladdr.glade.h:110
 # addressbook/gui/contact-editor/e-contact-editor-address.c:235
 # my-evolution/Locations.h:1046
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "约旦"
@@ -3411,28 +3470,28 @@ msgstr "约旦"
 # addressbook/gui/contact-editor/fulladdr.glade.h:111
 # addressbook/gui/contact-editor/fulladdr.glade.h:111
 # addressbook/gui/contact-editor/e-contact-editor-address.c:236
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "哈萨克斯坦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:112
 # addressbook/gui/contact-editor/fulladdr.glade.h:112
 # addressbook/gui/contact-editor/e-contact-editor-address.c:237
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "肯尼亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:113
 # addressbook/gui/contact-editor/fulladdr.glade.h:113
 # addressbook/gui/contact-editor/e-contact-editor-address.c:238
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "基里巴斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:60
 # addressbook/gui/contact-editor/fulladdr.glade.h:60
 # addressbook/gui/contact-editor/e-contact-editor-address.c:239
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Korea, Republic Of"
 msgstr "大韩民国"
 
@@ -3440,7 +3499,7 @@ msgstr "大韩民国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:114
 # addressbook/gui/contact-editor/e-contact-editor-address.c:240
 # my-evolution/Locations.h:1146
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "科威特"
@@ -3448,14 +3507,14 @@ msgstr "科威特"
 # addressbook/gui/contact-editor/fulladdr.glade.h:115
 # addressbook/gui/contact-editor/fulladdr.glade.h:115
 # addressbook/gui/contact-editor/e-contact-editor-address.c:241
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "吉尔吉斯斯坦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/e-contact-editor-address.c:242
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "老挝"
 
@@ -3463,7 +3522,7 @@ msgstr "老挝"
 # addressbook/gui/contact-editor/fulladdr.glade.h:117
 # addressbook/gui/contact-editor/e-contact-editor-address.c:243
 # my-evolution/Locations.h:1190
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "拉脱维亚"
 
@@ -3471,7 +3530,7 @@ msgstr "拉脱维亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:118
 # addressbook/gui/contact-editor/e-contact-editor-address.c:244
 # my-evolution/Locations.h:1198
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "黎巴嫩"
@@ -3479,7 +3538,7 @@ msgstr "黎巴嫩"
 # addressbook/gui/contact-editor/fulladdr.glade.h:119
 # addressbook/gui/contact-editor/fulladdr.glade.h:119
 # addressbook/gui/contact-editor/e-contact-editor-address.c:245
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr "莱索托"
 
@@ -3487,7 +3546,7 @@ msgstr "莱索托"
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # addressbook/gui/contact-editor/e-contact-editor-address.c:246
 # my-evolution/Locations.h:1218
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "利比里亚"
@@ -3495,7 +3554,7 @@ msgstr "利比里亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:121
 # addressbook/gui/contact-editor/fulladdr.glade.h:121
 # addressbook/gui/contact-editor/e-contact-editor-address.c:247
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "列支敦士登"
 
@@ -3503,7 +3562,7 @@ msgstr "列支敦士登"
 # addressbook/gui/contact-editor/fulladdr.glade.h:122
 # addressbook/gui/contact-editor/e-contact-editor-address.c:248
 # my-evolution/Locations.h:1234
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "立陶宛"
@@ -3512,7 +3571,7 @@ msgstr "立陶宛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # addressbook/gui/contact-editor/e-contact-editor-address.c:249
 # my-evolution/Locations.h:1268
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "卢森堡"
@@ -3520,49 +3579,49 @@ msgstr "卢森堡"
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # addressbook/gui/contact-editor/e-contact-editor-address.c:250
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr "澳门"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # addressbook/gui/contact-editor/e-contact-editor-address.c:251
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "马其顿"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:126
 # addressbook/gui/contact-editor/fulladdr.glade.h:126
 # addressbook/gui/contact-editor/e-contact-editor-address.c:252
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "马达加斯加"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:127
 # addressbook/gui/contact-editor/fulladdr.glade.h:127
 # addressbook/gui/contact-editor/e-contact-editor-address.c:253
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "马拉维"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:128
 # addressbook/gui/contact-editor/fulladdr.glade.h:128
 # addressbook/gui/contact-editor/e-contact-editor-address.c:254
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "马来西亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:129
 # addressbook/gui/contact-editor/fulladdr.glade.h:129
 # addressbook/gui/contact-editor/e-contact-editor-address.c:255
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "马尔代夫"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:130
 # addressbook/gui/contact-editor/fulladdr.glade.h:130
 # addressbook/gui/contact-editor/e-contact-editor-address.c:256
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "马里"
 
@@ -3570,7 +3629,7 @@ msgstr "马里"
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/e-contact-editor-address.c:257
 # my-evolution/Locations.h:1297
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "马耳他"
@@ -3578,35 +3637,35 @@ msgstr "马耳他"
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/e-contact-editor-address.c:258
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Marshall Islands"
 msgstr "马绍尔群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # addressbook/gui/contact-editor/e-contact-editor-address.c:259
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "马提尼可岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/e-contact-editor-address.c:260
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "毛里塔尼亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:135
 # addressbook/gui/contact-editor/fulladdr.glade.h:135
 # addressbook/gui/contact-editor/e-contact-editor-address.c:261
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "毛里求斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:136
 # addressbook/gui/contact-editor/fulladdr.glade.h:136
 # addressbook/gui/contact-editor/e-contact-editor-address.c:262
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "马约特岛"
 
@@ -3614,7 +3673,7 @@ msgstr "马约特岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:137
 # addressbook/gui/contact-editor/e-contact-editor-address.c:263
 # my-evolution/Locations.h:1387
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "墨西哥"
@@ -3622,35 +3681,35 @@ msgstr "墨西哥"
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "密克罗尼西亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:60
 # addressbook/gui/contact-editor/fulladdr.glade.h:60
 # addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr "摩尔多瓦共和国"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/e-contact-editor-address.c:266
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "摩纳哥"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # addressbook/gui/contact-editor/e-contact-editor-address.c:267
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "蒙古"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/e-contact-editor-address.c:268
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "蒙特塞拉特群岛"
 
@@ -3658,7 +3717,7 @@ msgstr "蒙特塞拉特群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:142
 # addressbook/gui/contact-editor/e-contact-editor-address.c:269
 # my-evolution/Locations.h:1470
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "摩洛哥"
@@ -3666,35 +3725,35 @@ msgstr "摩洛哥"
 # addressbook/gui/contact-editor/fulladdr.glade.h:143
 # addressbook/gui/contact-editor/fulladdr.glade.h:143
 # addressbook/gui/contact-editor/e-contact-editor-address.c:270
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "莫桑比克"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:144
 # addressbook/gui/contact-editor/fulladdr.glade.h:144
 # addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "缅甸"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:145
 # addressbook/gui/contact-editor/fulladdr.glade.h:145
 # addressbook/gui/contact-editor/e-contact-editor-address.c:272
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "纳米比亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:146
 # addressbook/gui/contact-editor/fulladdr.glade.h:146
 # addressbook/gui/contact-editor/e-contact-editor-address.c:273
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "瑙鲁"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:147
 # addressbook/gui/contact-editor/fulladdr.glade.h:147
 # addressbook/gui/contact-editor/e-contact-editor-address.c:274
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "尼泊尔"
 
@@ -3702,7 +3761,7 @@ msgstr "尼泊尔"
 # addressbook/gui/contact-editor/fulladdr.glade.h:148
 # addressbook/gui/contact-editor/e-contact-editor-address.c:275
 # my-evolution/Locations.h:1531
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "荷兰"
@@ -3710,14 +3769,14 @@ msgstr "荷兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:149
 # addressbook/gui/contact-editor/fulladdr.glade.h:149
 # addressbook/gui/contact-editor/e-contact-editor-address.c:276
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "荷属安的列斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "新喀里多尼亚"
 
@@ -3725,7 +3784,7 @@ msgstr "新喀里多尼亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # addressbook/gui/contact-editor/e-contact-editor-address.c:278
 # my-evolution/Locations.h:1560
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "新西兰"
@@ -3734,7 +3793,7 @@ msgstr "新西兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:152
 # addressbook/gui/contact-editor/e-contact-editor-address.c:279
 # my-evolution/Locations.h:1562
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
@@ -3742,21 +3801,21 @@ msgstr "尼加拉瓜"
 # addressbook/gui/contact-editor/fulladdr.glade.h:153
 # addressbook/gui/contact-editor/fulladdr.glade.h:153
 # addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "尼日尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:154
 # addressbook/gui/contact-editor/fulladdr.glade.h:154
 # addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "尼日利亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:155
 # addressbook/gui/contact-editor/fulladdr.glade.h:155
 # addressbook/gui/contact-editor/e-contact-editor-address.c:282
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "纽埃岛"
 
@@ -3764,7 +3823,7 @@ msgstr "纽埃岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # addressbook/gui/contact-editor/e-contact-editor-address.c:283
 # my-evolution/Locations.h:1574
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "诺福克岛"
@@ -3772,7 +3831,7 @@ msgstr "诺福克岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:157
 # addressbook/gui/contact-editor/fulladdr.glade.h:157
 # addressbook/gui/contact-editor/e-contact-editor-address.c:284
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "北马里亚那群岛"
 
@@ -3780,7 +3839,7 @@ msgstr "北马里亚那群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # addressbook/gui/contact-editor/e-contact-editor-address.c:285
 # my-evolution/Locations.h:1587
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "挪威"
@@ -3789,7 +3848,7 @@ msgstr "挪威"
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # addressbook/gui/contact-editor/e-contact-editor-address.c:286
 # my-evolution/Locations.h:1632
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "阿曼"
@@ -3798,7 +3857,7 @@ msgstr "阿曼"
 # addressbook/gui/contact-editor/fulladdr.glade.h:160
 # addressbook/gui/contact-editor/e-contact-editor-address.c:287
 # my-evolution/Locations.h:1673
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "巴基斯坦"
@@ -3806,14 +3865,14 @@ msgstr "巴基斯坦"
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "帕劳群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:162
 # addressbook/gui/contact-editor/fulladdr.glade.h:162
 # addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "巴勒斯坦地区"
 
@@ -3821,7 +3880,7 @@ msgstr "巴勒斯坦地区"
 # addressbook/gui/contact-editor/fulladdr.glade.h:163
 # addressbook/gui/contact-editor/e-contact-editor-address.c:290
 # my-evolution/Locations.h:1683
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "巴拿马"
@@ -3829,7 +3888,7 @@ msgstr "巴拿马"
 # addressbook/gui/contact-editor/fulladdr.glade.h:164
 # addressbook/gui/contact-editor/fulladdr.glade.h:164
 # addressbook/gui/contact-editor/e-contact-editor-address.c:291
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "巴布亚新几内亚"
 
@@ -3837,7 +3896,7 @@ msgstr "巴布亚新几内亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:165
 # addressbook/gui/contact-editor/e-contact-editor-address.c:292
 # my-evolution/Locations.h:1688
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "巴拉圭"
@@ -3846,7 +3905,7 @@ msgstr "巴拉圭"
 # addressbook/gui/contact-editor/fulladdr.glade.h:166
 # addressbook/gui/contact-editor/e-contact-editor-address.c:293
 # my-evolution/Locations.h:1723
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "秘鲁"
@@ -3854,14 +3913,14 @@ msgstr "秘鲁"
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "菲利宾"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:168
 # addressbook/gui/contact-editor/fulladdr.glade.h:168
 # addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "皮特克恩岛"
 
@@ -3869,7 +3928,7 @@ msgstr "皮特克恩岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/e-contact-editor-address.c:296
 # my-evolution/Locations.h:1764
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "波兰"
@@ -3878,7 +3937,7 @@ msgstr "波兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:170
 # addressbook/gui/contact-editor/e-contact-editor-address.c:297
 # my-evolution/Locations.h:1791
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "葡萄牙"
@@ -3887,7 +3946,7 @@ msgstr "葡萄牙"
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/e-contact-editor-address.c:298
 # my-evolution/Locations.h:1824
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "波多黎各"
@@ -3896,7 +3955,7 @@ msgstr "波多黎各"
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # addressbook/gui/contact-editor/e-contact-editor-address.c:299
 # my-evolution/Locations.h:1836
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "卡塔尔"
@@ -3904,7 +3963,7 @@ msgstr "卡塔尔"
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "留尼汪"
 
@@ -3912,7 +3971,7 @@ msgstr "留尼汪"
 # addressbook/gui/contact-editor/fulladdr.glade.h:176
 # addressbook/gui/contact-editor/e-contact-editor-address.c:301
 # my-evolution/Locations.h:1912
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "罗马尼亚"
@@ -3920,56 +3979,56 @@ msgstr "罗马尼亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:177
 # addressbook/gui/contact-editor/fulladdr.glade.h:177
 # addressbook/gui/contact-editor/e-contact-editor-address.c:302
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "俄罗斯联邦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:178
 # addressbook/gui/contact-editor/fulladdr.glade.h:178
 # addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "卢旺达"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:179
 # addressbook/gui/contact-editor/fulladdr.glade.h:179
 # addressbook/gui/contact-editor/e-contact-editor-address.c:304
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "圣基德和吉维斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/e-contact-editor-address.c:305
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "圣卢西亚岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:181
 # addressbook/gui/contact-editor/fulladdr.glade.h:181
 # addressbook/gui/contact-editor/e-contact-editor-address.c:306
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr "圣文森特和格林纳达"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/e-contact-editor-address.c:307
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "萨摩亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/e-contact-editor-address.c:308
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "San Marino"
 msgstr "圣马力诺"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:184
 # addressbook/gui/contact-editor/fulladdr.glade.h:184
 # addressbook/gui/contact-editor/e-contact-editor-address.c:309
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Sao Tome And Principe"
 msgstr "圣多美和普林西比"
 
@@ -3977,7 +4036,7 @@ msgstr "圣多美和普林西比"
 # addressbook/gui/contact-editor/fulladdr.glade.h:185
 # addressbook/gui/contact-editor/e-contact-editor-address.c:310
 # my-evolution/Locations.h:2035
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "沙特阿拉伯"
@@ -3985,21 +4044,21 @@ msgstr "沙特阿拉伯"
 # addressbook/gui/contact-editor/fulladdr.glade.h:186
 # addressbook/gui/contact-editor/fulladdr.glade.h:186
 # addressbook/gui/contact-editor/e-contact-editor-address.c:311
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "塞内加尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "塞舌尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:188
 # addressbook/gui/contact-editor/fulladdr.glade.h:188
 # addressbook/gui/contact-editor/e-contact-editor-address.c:313
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "塞拉利昂"
 
@@ -4007,7 +4066,7 @@ msgstr "塞拉利昂"
 # addressbook/gui/contact-editor/fulladdr.glade.h:189
 # addressbook/gui/contact-editor/e-contact-editor-address.c:314
 # my-evolution/Locations.h:2090
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "新加坡"
@@ -4016,7 +4075,7 @@ msgstr "新加坡"
 # addressbook/gui/contact-editor/fulladdr.glade.h:190
 # addressbook/gui/contact-editor/e-contact-editor-address.c:315
 # my-evolution/Locations.h:2103
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "斯洛伐克"
@@ -4025,7 +4084,7 @@ msgstr "斯洛伐克"
 # addressbook/gui/contact-editor/fulladdr.glade.h:191
 # addressbook/gui/contact-editor/e-contact-editor-address.c:316
 # my-evolution/Locations.h:2104
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "斯洛文尼亚"
@@ -4033,14 +4092,14 @@ msgstr "斯洛文尼亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "所罗门群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "索马里"
 
@@ -4048,7 +4107,7 @@ msgstr "索马里"
 # addressbook/gui/contact-editor/fulladdr.glade.h:194
 # addressbook/gui/contact-editor/e-contact-editor-address.c:319
 # my-evolution/Locations.h:2119
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "南非"
@@ -4056,7 +4115,7 @@ msgstr "南非"
 # addressbook/gui/contact-editor/fulladdr.glade.h:195
 # addressbook/gui/contact-editor/fulladdr.glade.h:195
 # addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "南乔治亚和南三文治群岛"
 
@@ -4064,7 +4123,7 @@ msgstr "南乔治亚和南三文治群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:196
 # addressbook/gui/contact-editor/e-contact-editor-address.c:321
 # my-evolution/Locations.h:2127
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "西班牙"
@@ -4072,28 +4131,28 @@ msgstr "西班牙"
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # addressbook/gui/contact-editor/e-contact-editor-address.c:322
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "斯里兰卡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:198
 # addressbook/gui/contact-editor/fulladdr.glade.h:198
 # addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "圣赫勒拿岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:199
 # addressbook/gui/contact-editor/fulladdr.glade.h:199
 # addressbook/gui/contact-editor/e-contact-editor-address.c:324
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "圣皮埃尔和麦克伦群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:200
 # addressbook/gui/contact-editor/fulladdr.glade.h:200
 # addressbook/gui/contact-editor/e-contact-editor-address.c:325
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "苏丹"
 
@@ -4101,7 +4160,7 @@ msgstr "苏丹"
 # addressbook/gui/contact-editor/fulladdr.glade.h:201
 # addressbook/gui/contact-editor/e-contact-editor-address.c:326
 # my-evolution/Locations.h:2176
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "苏里南"
@@ -4109,14 +4168,14 @@ msgstr "苏里南"
 # addressbook/gui/contact-editor/fulladdr.glade.h:202
 # addressbook/gui/contact-editor/fulladdr.glade.h:202
 # addressbook/gui/contact-editor/e-contact-editor-address.c:327
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "斯瓦巴和尖棉群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:203
 # addressbook/gui/contact-editor/fulladdr.glade.h:203
 # addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "斯威士兰"
 
@@ -4124,7 +4183,7 @@ msgstr "斯威士兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:204
 # addressbook/gui/contact-editor/e-contact-editor-address.c:329
 # my-evolution/Locations.h:2181
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "瑞典"
@@ -4133,7 +4192,7 @@ msgstr "瑞典"
 # addressbook/gui/contact-editor/fulladdr.glade.h:205
 # addressbook/gui/contact-editor/e-contact-editor-address.c:330
 # my-evolution/Locations.h:2183
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "瑞士"
@@ -4142,7 +4201,7 @@ msgstr "瑞士"
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/e-contact-editor-address.c:331
 # my-evolution/Locations.h:2205
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "台湾"
@@ -4150,56 +4209,56 @@ msgstr "台湾"
 # addressbook/gui/contact-editor/fulladdr.glade.h:207
 # addressbook/gui/contact-editor/fulladdr.glade.h:207
 # addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "塔吉克斯坦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:223
 # addressbook/gui/contact-editor/fulladdr.glade.h:223
 # addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr "坦桑尼亚联邦共和国"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:208
 # addressbook/gui/contact-editor/fulladdr.glade.h:208
 # addressbook/gui/contact-editor/e-contact-editor-address.c:334
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "泰国"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:209
 # addressbook/gui/contact-editor/fulladdr.glade.h:209
 # addressbook/gui/contact-editor/e-contact-editor-address.c:335
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "多哥"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/e-contact-editor-address.c:336
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "托克劳群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # addressbook/gui/contact-editor/e-contact-editor-address.c:337
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "汤加"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:212
 # addressbook/gui/contact-editor/fulladdr.glade.h:212
 # addressbook/gui/contact-editor/e-contact-editor-address.c:338
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "特里尼达和多巴哥"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:213
 # addressbook/gui/contact-editor/fulladdr.glade.h:213
 # addressbook/gui/contact-editor/e-contact-editor-address.c:339
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "突尼斯"
 
@@ -4207,7 +4266,7 @@ msgstr "突尼斯"
 # addressbook/gui/contact-editor/fulladdr.glade.h:214
 # addressbook/gui/contact-editor/e-contact-editor-address.c:340
 # my-evolution/Locations.h:2321
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "土耳其"
@@ -4215,28 +4274,28 @@ msgstr "土耳其"
 # addressbook/gui/contact-editor/fulladdr.glade.h:215
 # addressbook/gui/contact-editor/fulladdr.glade.h:215
 # addressbook/gui/contact-editor/e-contact-editor-address.c:341
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "土库曼斯坦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:216
 # addressbook/gui/contact-editor/fulladdr.glade.h:216
 # addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "特克斯和凯科斯群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:217
 # addressbook/gui/contact-editor/fulladdr.glade.h:217
 # addressbook/gui/contact-editor/e-contact-editor-address.c:343
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "图瓦卢"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:219
 # addressbook/gui/contact-editor/fulladdr.glade.h:219
 # addressbook/gui/contact-editor/e-contact-editor-address.c:344
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "乌干达"
 
@@ -4244,7 +4303,7 @@ msgstr "乌干达"
 # addressbook/gui/contact-editor/fulladdr.glade.h:220
 # addressbook/gui/contact-editor/e-contact-editor-address.c:345
 # my-evolution/Locations.h:2334
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "乌克兰"
@@ -4252,7 +4311,7 @@ msgstr "乌克兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:221
 # addressbook/gui/contact-editor/fulladdr.glade.h:221
 # addressbook/gui/contact-editor/e-contact-editor-address.c:346
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "阿拉伯联合酋长国"
 
@@ -4260,7 +4319,7 @@ msgstr "阿拉伯联合酋长国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:222
 # addressbook/gui/contact-editor/e-contact-editor-address.c:347
 # my-evolution/Locations.h:2342
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "英国"
@@ -4268,7 +4327,7 @@ msgstr "英国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:225
 # addressbook/gui/contact-editor/fulladdr.glade.h:225
 # addressbook/gui/contact-editor/e-contact-editor-address.c:348
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "美国小型外岛"
 
@@ -4276,7 +4335,7 @@ msgstr "美国小型外岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:226
 # addressbook/gui/contact-editor/e-contact-editor-address.c:349
 # my-evolution/Locations.h:2348
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "乌拉圭"
@@ -4284,14 +4343,14 @@ msgstr "乌拉圭"
 # addressbook/gui/contact-editor/fulladdr.glade.h:227
 # addressbook/gui/contact-editor/fulladdr.glade.h:227
 # addressbook/gui/contact-editor/e-contact-editor-address.c:350
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "乌兹别克斯坦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "努瓦阿图"
 
@@ -4299,7 +4358,7 @@ msgstr "努瓦阿图"
 # addressbook/gui/contact-editor/fulladdr.glade.h:229
 # addressbook/gui/contact-editor/e-contact-editor-address.c:352
 # my-evolution/Locations.h:2380
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "委内瑞拉"
@@ -4308,7 +4367,7 @@ msgstr "委内瑞拉"
 # addressbook/gui/contact-editor/fulladdr.glade.h:230
 # addressbook/gui/contact-editor/e-contact-editor-address.c:353
 # my-evolution/Locations.h:2392
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "越南"
@@ -4316,28 +4375,28 @@ msgstr "越南"
 # addressbook/gui/contact-editor/fulladdr.glade.h:218
 # addressbook/gui/contact-editor/fulladdr.glade.h:218
 # addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Virgin Islands, British"
 msgstr "英属处女群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:218
 # addressbook/gui/contact-editor/fulladdr.glade.h:218
 # addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Virgin Islands, U.S."
 msgstr "美属处女群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:231
 # addressbook/gui/contact-editor/fulladdr.glade.h:231
 # addressbook/gui/contact-editor/e-contact-editor-address.c:356
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "瓦利斯和富图纳群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:232
 # addressbook/gui/contact-editor/fulladdr.glade.h:232
 # addressbook/gui/contact-editor/e-contact-editor-address.c:357
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
@@ -4345,7 +4404,7 @@ msgstr "西撒哈拉"
 # addressbook/gui/contact-editor/fulladdr.glade.h:233
 # addressbook/gui/contact-editor/e-contact-editor-address.c:358
 # my-evolution/Locations.h:2512
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "也门"
@@ -4354,7 +4413,7 @@ msgstr "也门"
 # addressbook/gui/contact-editor/fulladdr.glade.h:234
 # addressbook/gui/contact-editor/e-contact-editor-address.c:359
 # my-evolution/Locations.h:2524
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "南斯拉夫"
@@ -4362,14 +4421,14 @@ msgstr "南斯拉夫"
 # addressbook/gui/contact-editor/fulladdr.glade.h:235
 # addressbook/gui/contact-editor/fulladdr.glade.h:235
 # addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "赞比亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:236
 # addressbook/gui/contact-editor/fulladdr.glade.h:236
 # addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
@@ -4428,14 +4487,14 @@ msgstr "无法为域找到构件：“%s”"
 # addressbook/gui/contact-editor/e-contact-quick-add.c:298
 # addressbook/gui/contact-editor/e-contact-quick-add.c:298
 # addressbook/gui/contact-editor/e-contact-quick-add.c:298
-#: addressbook/gui/contact-editor/e-contact-quick-add.c: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:300
 # addressbook/gui/contact-editor/e-contact-quick-add.c:300
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "完全编辑"
 
@@ -4445,7 +4504,7 @@ msgstr "完全编辑"
 # addressbook/gui/widgets/e-addressbook-view.c:850
 # addressbook/gui/contact-editor/e-contact-quick-add.c:326
 # addressbook/gui/widgets/e-addressbook-view.c:961
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "全名"
@@ -4453,7 +4512,7 @@ msgstr "全名"
 # addressbook/gui/contact-editor/e-contact-quick-add.c:332
 # addressbook/gui/contact-editor/e-contact-quick-add.c:332
 # addressbook/gui/contact-editor/e-contact-quick-add.c:332
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "电子邮件"
 
@@ -4484,6 +4543,25 @@ msgstr ""
 "%s 已经存在\n"
 "您打算覆盖它吗？"
 
+#: addressbook/gui/contact-editor/file-exists.glade.h:1
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:2
+msgid "Don't bother translating this string.  It's not used."
+msgstr ""
+
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
+# mail/mail-display.c:101
+#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#, fuzzy
+msgid "Overwrite"
+msgstr "覆盖文件？"
+
 # addressbook/gui/contact-editor/fulladdr.glade.h:1
 # addressbook/gui/contact-editor/fulladdr.glade.h:1
 # addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -4716,7 +4794,7 @@ msgstr "联系人列表编辑器"
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr "将列表保存为 VCard"
 
@@ -4802,7 +4880,7 @@ msgstr ""
 # addressbook/gui/search/e-addressbook-search-dialog.c:145
 # widgets/misc/e-filter-bar.c:238
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "高级搜索"
 
@@ -4820,21 +4898,21 @@ msgstr "搜索"
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "没有卡片"
 
 # addressbook/gui/widgets/e-addressbook-model.c:130
 # addressbook/gui/widgets/e-addressbook-model.c:130
 # addressbook/gui/widgets/e-addressbook-model.c:130
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 张卡片"
 
 # addressbook/gui/widgets/e-addressbook-model.c:133
 # addressbook/gui/widgets/e-addressbook-model.c:133
 # addressbook/gui/widgets/e-addressbook-model.c:133
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d 张卡片"
@@ -4842,7 +4920,7 @@ msgstr "%d 张卡片"
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:466
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "启动 %s 错误"
@@ -4856,7 +4934,7 @@ msgstr "启动 %s 错误"
 # addressbook/gui/widgets/e-addressbook-table-adapter.c:140
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-minicard.c:475
-#: 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"
@@ -4886,10 +4964,10 @@ msgstr "成功"
 # camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
 # shell/e-storage.c:528 shell/evolution-shell-component.c:1057
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: 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 "未知的错误"
 
@@ -4906,7 +4984,7 @@ msgstr "仓库离线"
 # shell/evolution-shell-component.c:1035
 # addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
 # shell/evolution-shell-component.c:1048
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "没有权限"
@@ -4951,8 +5029,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 "已经取消"
 
@@ -5039,7 +5117,7 @@ msgstr "删除列表错误"
 # addressbook/gui/widgets/e-addressbook-view.c:1389
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "删除卡片错误"
 
@@ -5059,11 +5137,10 @@ msgstr "显示卡片"
 
 # addressbook/gui/widgets/e-addressbook-util.c:207
 #: 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 个卡片。这将在您的显示屏上打开\n"
 " %d 个新窗口。您真的希望显示所有这些卡片？"
@@ -5233,7 +5310,7 @@ msgstr "地址簿"
 # ui/evolution-addressbook.xml.h:19
 #: 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"
@@ -5420,7 +5497,7 @@ msgstr "粘贴"
 # mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
 # ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 # ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c: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
@@ -5431,8 +5508,8 @@ msgstr "删除"
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
-#: addressbook/gui/widgets/e-addressbook-view.c: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 "当前视图(_C)"
@@ -5444,7 +5521,7 @@ msgstr "当前视图(_C)"
 #. 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"
 
@@ -5455,11 +5532,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"
@@ -5682,7 +5759,7 @@ msgstr "包含："
 # addressbook/printing/e-contact-print.glade.h:18
 # addressbook/printing/e-contact-print.glade.h:18
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "横向"
 
@@ -5725,7 +5802,7 @@ msgstr "选项"
 # addressbook/printing/e-contact-print.glade.h:24
 # addressbook/printing/e-contact-print.glade.h:24
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "方向"
 
@@ -5764,7 +5841,7 @@ msgstr "纸张来源："
 # addressbook/printing/e-contact-print.glade.h:29
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "纵向"
 
@@ -5877,7 +5954,7 @@ msgstr "无标题约会"
 # calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/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 "高"
 
@@ -5896,7 +5973,7 @@ 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 "中"
 
@@ -5911,7 +5988,7 @@ msgstr "中"
 # calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/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 "低"
 
@@ -5931,13 +6008,17 @@ msgstr "低"
 msgid "Undefined"
 msgstr "未定义"
 
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
 # calendar/conduits/calendar/calendar-conduit.c:937
 # calendar/conduits/todo/todo-conduit.c:649
 # calendar/conduits/calendar/calendar-conduit.c:1034
 # calendar/conduits/todo/todo-conduit.c:649
 # calendar/conduits/calendar/calendar-conduit.c:1150
 # calendar/conduits/todo/todo-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "在与日历服务器通讯时发生错误"
@@ -5948,8 +6029,8 @@ msgstr "在与日历服务器通讯时发生错误"
 # calendar/conduits/calendar/calendar-conduit.c:1175
 # calendar/conduits/calendar/calendar-conduit.c:1297
 # calendar/conduits/calendar/calendar-conduit.c:1300
-#: calendar/conduits/calendar/calendar-conduit.c: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 日历应用程序块"
 
@@ -6140,14 +6221,14 @@ msgstr "编辑约会(_E)"
 # calendar/gui/alarm-notify/alarm-queue.c:670
 # calendar/gui/alarm-notify/alarm-queue.c:670
 # calendar/gui/alarm-notify/alarm-queue.c:675
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "没有描述。"
 
 # calendar/gui/alarm-notify/alarm-queue.c:730
 # calendar/gui/alarm-notify/alarm-queue.c:730
 # calendar/gui/alarm-notify/alarm-queue.c:735
-#: calendar/gui/alarm-notify/alarm-queue.c: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"
@@ -6164,8 +6245,8 @@ msgstr ""
 # calendar/gui/alarm-notify/alarm-queue.c:753
 # calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
 # widgets/misc/e-messagebox.c:159
-#: calendar/gui/alarm-notify/alarm-queue.c: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 "警告"
@@ -6173,7 +6254,7 @@ msgstr "警告"
 # calendar/gui/alarm-notify/alarm-queue.c:781
 # calendar/gui/alarm-notify/alarm-queue.c:781
 # calendar/gui/alarm-notify/alarm-queue.c:758
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -6192,21 +6273,21 @@ msgstr ""
 # mail/mail-callbacks.c:2142
 # mail/mail-callbacks.c:2261
 # calendar/gui/alarm-notify/alarm-queue.c:772
-#: calendar/gui/alarm-notify/alarm-queue.c: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:166 calendar/gui/main.c:57
 # calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 # calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c: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:186
 # calendar/gui/alarm-notify/notify-main.c:186
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr "无法创建提醒服务车间"
 
@@ -6297,7 +6378,7 @@ msgstr "%B %d"
 # calendar/gui/calendar-commands.c:805
 # calendar/gui/calendar-commands.c:820
 # calendar/gui/calendar-commands.c:820
-#: 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 "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
@@ -6470,9 +6551,9 @@ msgstr ""
 # widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c: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
@@ -6504,8 +6585,8 @@ msgstr "已分派"
 # calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
 # calendar/gui/e-meeting-model.c:810
 #: calendar/gui/calendar-model.c: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 "是"
 
@@ -6516,7 +6597,7 @@ msgstr "是"
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
 # calendar/gui/e-meeting-model.c:811
 #: calendar/gui/calendar-model.c: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 "否"
 
@@ -6554,8 +6635,8 @@ msgstr "月视图"
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/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 "日历"
@@ -6563,10 +6644,26 @@ msgstr "日历"
 # calendar/gui/component-factory.c:64
 # calendar/gui/component-factory.c:64
 # calendar/gui/component-factory.c:64
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "文件夹含有约会和事件"
 
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "公开日历 URL(_P)："
+
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "文件夹含有约会和事件"
+
 # calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
 # my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
 # shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
@@ -6579,10 +6676,10 @@ msgstr "文件夹含有约会和事件"
 # my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
 # shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 # views/tasks/galview.xml.h:1
-#: calendar/gui/component-factory.c: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: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"
@@ -6591,14 +6688,30 @@ msgstr "任务"
 # calendar/gui/component-factory.c:69
 # calendar/gui/component-factory.c:69
 # calendar/gui/component-factory.c:69
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "文件夹含有 to-do 项"
 
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1115
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "打印卡片"
+
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "文件夹含有 to-do 项"
+
 # ui/evolution-calendar.xml.h:21
 # ui/evolution-calendar.xml.h:21
 # ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "新建约会"
@@ -6606,7 +6719,7 @@ msgstr "新建约会"
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "约会"
@@ -6614,14 +6727,14 @@ msgstr "约会"
 # calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 # calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 # calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
 # my-evolution/my-evolution.glade.h:10
 # my-evolution/my-evolution.glade.h:10
 # my-evolution/my-evolution.glade.h:10
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "新闻来源设置"
@@ -6635,7 +6748,7 @@ msgstr "新闻来源设置"
 # calendar/gui/dialogs/event-editor.c:207
 # calendar/gui/dialogs/event-editor.c:263
 # calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "会见"
@@ -6646,7 +6759,7 @@ msgstr "会见"
 # ui/evolution-tasks.xml.h:5
 # calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 # ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "创建新任务"
@@ -6654,7 +6767,7 @@ msgstr "创建新任务"
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "新建任务"
@@ -6662,7 +6775,7 @@ msgstr "新建任务"
 # ui/evolution-tasks.xml.h:18
 # ui/evolution-tasks.xml.h:18
 # ui/evolution-tasks.xml.h:22
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "任务(_T)"
 
@@ -6672,14 +6785,14 @@ msgstr "任务(_T)"
 # ui/evolution-tasks.xml.h:5
 # calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 # ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "创建新任务"
 
 # ui/evolution-calendar.xml.h:21
 # ui/evolution-calendar.xml.h:21
 # ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "新建约会"
@@ -6687,7 +6800,7 @@ msgstr "新建约会"
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "新建约会(_A)"
@@ -6695,7 +6808,7 @@ msgstr "新建约会(_A)"
 # calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 # calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 # calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "创建新约会"
@@ -6765,45 +6878,46 @@ msgstr "未知提醒选项"
 msgid "Alarm Repeat"
 msgstr "提醒重复"
 
+# calendar/gui/dialogs/alarm-options.glade.h:6
+# calendar/gui/dialogs/alarm-options.glade.h:6
+# calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+#, fuzzy
+msgid ""
+"Evolution does not yet support email notification for reminders.  You will "
+"not be able to edit the options for this reminder."
+msgstr ""
+"这是电子邮件提示器，但 Evolution 尚不支持这类提示器。您无法为该提示器编辑选"
+"项。"
+
 # calendar/gui/dialogs/alarm-options.glade.h:2
 # calendar/gui/dialogs/alarm-options.glade.h:2
 # calendar/gui/dialogs/alarm-options.glade.h:2
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: 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:3
 # calendar/gui/dialogs/alarm-options.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "播放声音："
 
 # calendar/gui/dialogs/alarm-options.glade.h:4
 # calendar/gui/dialogs/alarm-options.glade.h:4
 # calendar/gui/dialogs/alarm-options.glade.h:4
-#: calendar/gui/dialogs/alarm-options.glade.h: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:5
 # calendar/gui/dialogs/alarm-options.glade.h:5
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "运行程序："
 
-# calendar/gui/dialogs/alarm-options.glade.h:6
-# calendar/gui/dialogs/alarm-options.glade.h:6
-# calendar/gui/dialogs/alarm-options.glade.h:6
-#: calendar/gui/dialogs/alarm-options.glade.h: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 ""
-"这是电子邮件提示器，但 Evolution 尚不支持这类提示器。您无法为该提示器编辑选"
-"项。"
-
 # calendar/gui/dialogs/alarm-options.glade.h:7
 # calendar/gui/dialogs/alarm-options.glade.h:7
 # calendar/gui/dialogs/alarm-options.glade.h:7
@@ -6846,7 +6960,7 @@ msgstr "分钟"
 # calendar/gui/dialogs/alarm-page.c:309
 # calendar/gui/dialogs/alarm-page.c:309
 # calendar/gui/dialogs/alarm-page.c:309
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d 天"
@@ -6854,14 +6968,14 @@ msgstr "%d 天"
 # calendar/gui/dialogs/alarm-page.c:312
 # calendar/gui/dialogs/alarm-page.c:312
 # calendar/gui/dialogs/alarm-page.c:312
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 天"
 
 # calendar/gui/dialogs/alarm-page.c:317
 # calendar/gui/dialogs/alarm-page.c:317
 # calendar/gui/dialogs/alarm-page.c:317
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d 周"
@@ -6869,14 +6983,14 @@ msgstr "%d 周"
 # calendar/gui/dialogs/alarm-page.c:320
 # calendar/gui/dialogs/alarm-page.c:320
 # calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 周"
 
 # calendar/gui/dialogs/alarm-page.c:325
 # calendar/gui/dialogs/alarm-page.c:325
 # calendar/gui/dialogs/alarm-page.c:325
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d 小时"
@@ -6884,14 +6998,14 @@ msgstr "%d 小时"
 # calendar/gui/dialogs/alarm-page.c:328
 # calendar/gui/dialogs/alarm-page.c:328
 # calendar/gui/dialogs/alarm-page.c:328
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 小时"
 
 # calendar/gui/dialogs/alarm-page.c:333
 # calendar/gui/dialogs/alarm-page.c:333
 # calendar/gui/dialogs/alarm-page.c:333
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d 分钟"
@@ -6899,14 +7013,14 @@ msgstr "%d 分钟"
 # calendar/gui/dialogs/alarm-page.c:336
 # calendar/gui/dialogs/alarm-page.c:336
 # calendar/gui/dialogs/alarm-page.c:336
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 分钟"
 
 # calendar/gui/dialogs/alarm-page.c:341
 # calendar/gui/dialogs/alarm-page.c:341
 # calendar/gui/dialogs/alarm-page.c:341
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒"
@@ -6914,7 +7028,7 @@ msgstr "%d 秒"
 # calendar/gui/dialogs/alarm-page.c:344
 # calendar/gui/dialogs/alarm-page.c:344
 # calendar/gui/dialogs/alarm-page.c:344
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 秒"
 
@@ -6924,7 +7038,7 @@ msgstr "1 秒"
 # calendar/gui/dialogs/alarm-page.glade.h:4
 # calendar/gui/dialogs/alarm-page.c:373
 # calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/alarm-page.c:373
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "播放声音"
@@ -6935,7 +7049,7 @@ msgstr "播放声音"
 # calendar/gui/dialogs/alarm-page.glade.h:3
 # calendar/gui/dialogs/alarm-page.c:377
 # calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "显示消息"
@@ -6943,7 +7057,7 @@ msgstr "显示消息"
 # calendar/gui/dialogs/alarm-page.c:381
 # calendar/gui/dialogs/alarm-page.c:381
 # calendar/gui/dialogs/alarm-page.c:381
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "发送电子邮件"
 
@@ -6953,7 +7067,7 @@ msgstr "发送电子邮件"
 # calendar/gui/dialogs/alarm-page.glade.h:6
 # calendar/gui/dialogs/alarm-page.c:385
 # calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:395
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "运行程序"
@@ -6961,14 +7075,14 @@ msgstr "运行程序"
 # calendar/gui/dialogs/alarm-page.c:391
 # calendar/gui/dialogs/alarm-page.c:391
 # calendar/gui/dialogs/alarm-page.c:391
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "执行未知的动作"
 
 # calendar/gui/dialogs/alarm-page.c:403
 # calendar/gui/dialogs/alarm-page.c:403
 # calendar/gui/dialogs/alarm-page.c:403
-#: calendar/gui/dialogs/alarm-page.c:403
+#: calendar/gui/dialogs/alarm-page.c:413
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "在约会开始之前 %s %s"
@@ -6976,7 +7090,7 @@ msgstr "在约会开始之前 %s %s"
 # calendar/gui/dialogs/alarm-page.c:406
 # calendar/gui/dialogs/alarm-page.c:406
 # calendar/gui/dialogs/alarm-page.c:406
-#: calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/dialogs/alarm-page.c:416
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "在约会开始之后 %s %s"
@@ -6984,7 +7098,7 @@ msgstr "在约会开始之后 %s %s"
 # calendar/gui/dialogs/alarm-page.c:411
 # calendar/gui/dialogs/alarm-page.c:411
 # calendar/gui/dialogs/alarm-page.c:411
-#: calendar/gui/dialogs/alarm-page.c:411
+#: calendar/gui/dialogs/alarm-page.c:421
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "在约会开始时 %s"
@@ -6992,7 +7106,7 @@ msgstr "在约会开始时 %s"
 # calendar/gui/dialogs/alarm-page.c:420
 # calendar/gui/dialogs/alarm-page.c:420
 # calendar/gui/dialogs/alarm-page.c:420
-#: calendar/gui/dialogs/alarm-page.c:420
+#: calendar/gui/dialogs/alarm-page.c:430
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "在约会结束之前 %s %s"
@@ -7000,7 +7114,7 @@ msgstr "在约会结束之前 %s %s"
 # calendar/gui/dialogs/alarm-page.c:423
 # calendar/gui/dialogs/alarm-page.c:423
 # calendar/gui/dialogs/alarm-page.c:423
-#: calendar/gui/dialogs/alarm-page.c:423
+#: calendar/gui/dialogs/alarm-page.c:433
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "在约会结束之后 %s %s"
@@ -7008,7 +7122,7 @@ msgstr "在约会结束之后 %s %s"
 # calendar/gui/dialogs/alarm-page.c:428
 # calendar/gui/dialogs/alarm-page.c:428
 # calendar/gui/dialogs/alarm-page.c:428
-#: calendar/gui/dialogs/alarm-page.c:428
+#: calendar/gui/dialogs/alarm-page.c:438
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "在约会结束时 %s"
@@ -7016,7 +7130,7 @@ msgstr "在约会结束时 %s"
 # calendar/gui/dialogs/alarm-page.c:453
 # calendar/gui/dialogs/alarm-page.c:453
 # calendar/gui/dialogs/alarm-page.c:452
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "在 %2$s 时 %1$s"
@@ -7024,7 +7138,7 @@ msgstr "在 %2$s 时 %1$s"
 # calendar/gui/dialogs/alarm-page.c:459
 # calendar/gui/dialogs/alarm-page.c:459
 # calendar/gui/dialogs/alarm-page.c:458
-#: calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/dialogs/alarm-page.c:468
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触发类型"
@@ -7069,7 +7183,7 @@ msgstr "提示器"
 # calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/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 "概要："
 
@@ -7215,7 +7329,7 @@ msgstr "天数"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 # calendar/gui/dialogs/recurrence-page.c:963
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "星期五"
 
@@ -7240,7 +7354,7 @@ msgstr "分钟"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 # calendar/gui/dialogs/recurrence-page.c:959
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "星期一"
 
@@ -7259,7 +7373,7 @@ msgstr "星期日(_N)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "星期六"
 
@@ -7281,7 +7395,7 @@ msgstr "在日期浏览器中显示周数(_N)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 # calendar/gui/dialogs/recurrence-page.c:965
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "星期日"
 
@@ -7315,7 +7429,7 @@ msgstr "任务列表(_T)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 # calendar/gui/dialogs/recurrence-page.c:962
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "星期四"
 
@@ -7347,7 +7461,7 @@ msgstr "时间格式："
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 # calendar/gui/dialogs/recurrence-page.c:960
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -7362,7 +7476,7 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 # calendar/gui/dialogs/recurrence-page.c:961
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -7721,8 +7835,8 @@ msgstr "没有概要"
 # composer/e-msg-composer.c:947
 # composer/e-msg-composer.c:912
 #: 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 "另存为..."
 
@@ -7833,21 +7947,21 @@ msgstr "输入代表"
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/dialogs/event-editor.c: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:190
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "提醒"
 
 # calendar/gui/dialogs/event-editor.c:195
 # calendar/gui/dialogs/event-editor.c:195
 # calendar/gui/dialogs/event-editor.c:195
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "再次发生"
 
@@ -7860,9 +7974,9 @@ msgstr "再次发生"
 # calendar/gui/dialogs/event-editor.c:202
 # calendar/gui/dialogs/event-editor.c:260
 # calendar/gui/dialogs/event-editor.c:363
-#: calendar/gui/dialogs/event-editor.c: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 "正在调度"
 
@@ -7875,9 +7989,9 @@ msgstr "正在调度"
 # calendar/gui/dialogs/event-editor.c:207
 # calendar/gui/dialogs/event-editor.c:263
 # calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/dialogs/event-editor.c: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 "会见"
 
@@ -8018,28 +8132,28 @@ msgstr "开始时间(_S)："
 # calendar/gui/dialogs/meeting-page.c:425
 # calendar/gui/dialogs/meeting-page.c:425
 # calendar/gui/dialogs/meeting-page.c:425
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
 # calendar/gui/dialogs/meeting-page.c:446
 # calendar/gui/dialogs/meeting-page.c:446
 # calendar/gui/dialogs/meeting-page.c:446
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "需要至少一个参加者。"
 
 # calendar/gui/dialogs/meeting-page.c:626
 # calendar/gui/dialogs/meeting-page.c:626
 # calendar/gui/dialogs/meeting-page.c:626
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "那个人已经参加了会议！"
 
 # calendar/gui/dialogs/meeting-page.c:701
 # calendar/gui/dialogs/meeting-page.c:701
 # calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "授权于(_D)..."
 
@@ -8130,7 +8244,7 @@ msgstr "成员"
 # calendar/gui/e-itip-control.c:809
 # calendar/gui/e-meeting-time-sel.etspec.h:8
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -8160,7 +8274,7 @@ msgstr "角色"
 # mail/message-list.etspec.h:9
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "状态"
@@ -8281,19 +8395,19 @@ msgstr "该约会含有 Evolution 无法编辑的循环。"
 # calendar/gui/dialogs/recurrence-page.c:932
 # calendar/gui/dialogs/recurrence-page.c:932
 # calendar/gui/dialogs/recurrence-page.c:932
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "在"
 
 # my-evolution/metar.c:262
 # my-evolution/metar.c:262
 # my-evolution/metar.c:262
-#: 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 "秒"
 
@@ -8308,7 +8422,7 @@ msgstr "秒"
 # addressbook/gui/contact-editor/e-contact-editor.c:1714
 # mail/mail-config.glade.h:49
 # my-evolution/Locations.h:1614
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "其它"
@@ -8316,7 +8430,7 @@ msgstr "其它"
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "北"
@@ -8324,7 +8438,7 @@ msgstr "北"
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "列表"
@@ -8338,7 +8452,7 @@ msgstr "列表"
 # addressbook/backend/ebook/e-card-simple.c:80
 # addressbook/gui/contact-editor/e-contact-editor.c:1657
 # addressbook/gui/widgets/e-addressbook-view.c:980
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "其它传真"
@@ -8346,21 +8460,21 @@ msgstr "其它传真"
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/recurrence-page.c: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:1088
 # calendar/gui/dialogs/recurrence-page.c:1088
 # calendar/gui/dialogs/recurrence-page.c:1088
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "在"
 
 # calendar/gui/dialogs/recurrence-page.c:1269
 # calendar/gui/dialogs/recurrence-page.c:1269
 # calendar/gui/dialogs/recurrence-page.c:1269
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "循环"
 
@@ -8524,7 +8638,7 @@ msgstr "完成日期："
 # calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c: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 "需要动作"
 
@@ -8542,7 +8656,7 @@ msgstr "进度"
 # calendar/gui/dialogs/task-details-page.glade.h:12
 # my-evolution/e-summary-preferences.c:966
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL："
 
@@ -8566,7 +8680,7 @@ msgstr "状态(_S)："
 # calendar/gui/dialogs/task-editor.c:178
 # addressbook/gui/component/addressbook-config.glade.h:9
 # calendar/gui/dialogs/task-editor.c:178
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "基本"
 
@@ -8579,9 +8693,9 @@ msgstr "基本"
 # calendar/gui/dialogs/task-editor.c:190
 # calendar/gui/dialogs/task-editor.c:227
 # calendar/gui/dialogs/task-editor.c:322
-#: calendar/gui/dialogs/task-editor.c: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 "分派"
 
@@ -8594,7 +8708,7 @@ msgstr "分派"
 # calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c: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:"
@@ -8709,7 +8823,7 @@ msgstr "100%"
 # calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
 # calendar/gui/e-week-view.c:1828
 #: calendar/gui/e-calendar-table.c: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 "删除选中的对象"
 
@@ -8722,8 +8836,8 @@ msgstr "删除选中的对象"
 # calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
 # calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
 # shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c: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 "打开(_O)"
@@ -8745,8 +8859,8 @@ msgstr "另存为..."
 # ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
 # ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
 # ui/my-evolution.xml.h:7
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c: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
@@ -8762,8 +8876,8 @@ msgstr "打印(_P)..."
 # calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
 # calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
 # ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c: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 "剪切(_U)"
@@ -8780,8 +8894,8 @@ msgstr "剪切(_U)"
 # calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
 # ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 # ui/evolution-tasks.xml.h:17
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c: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"
@@ -8802,9 +8916,9 @@ msgstr "复制(_C)"
 # calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
 # ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 # ui/evolution-tasks.xml.h:21
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c: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"
@@ -8854,8 +8968,8 @@ msgstr "删除选定的任务(_D)"
 # calendar/gui/e-week-view.c:3924
 # calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
 # calendar/gui/e-week-view.c:3928
-#: calendar/gui/e-calendar-table.c: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 "更新对象"
 
@@ -8865,7 +8979,7 @@ msgstr "更新对象"
 # calendar/gui/e-calendar-table.etspec.h:6
 # calendar/gui/e-calendar-table.c:1247
 # calendar/gui/e-calendar-table.etspec.h:6
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "点击以添加任务"
@@ -8883,8 +8997,8 @@ msgstr "提醒"
 # camel/camel-filter-driver.c:886
 # calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
 # camel/camel-filter-driver.c:1026
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c: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 "完成"
 
@@ -8940,7 +9054,7 @@ msgstr "开始日期"
 # my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
 # shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "概要"
@@ -9058,14 +9172,14 @@ msgstr "下午"
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "新建约会(_A)"
 
 # calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
 # calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3410
 # calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
-#: calendar/gui/e-day-view.c: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 "新建全天事件(_E)"
 
@@ -9078,7 +9192,7 @@ msgstr "新建全天事件(_E)"
 # calendar/gui/dialogs/event-editor.c:207
 # calendar/gui/dialogs/event-editor.c:263
 # calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/e-day-view.c: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 "会见"
@@ -9086,14 +9200,14 @@ msgstr "会见"
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/e-day-view.c: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 "新建任务"
 
 # ui/evolution-comp-editor.xml.h:11
 # ui/evolution-comp-editor.xml.h:11
 # ui/evolution-comp-editor.xml.h:11
-#: calendar/gui/e-day-view.c: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 "打印..."
 
@@ -9103,7 +9217,7 @@ msgstr "打印..."
 # ui/evolution-calendar.xml.h:17
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
 # ui/evolution-calendar.xml.h:17
-#: calendar/gui/e-day-view.c: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 "转到今天(_T)"
@@ -9111,14 +9225,14 @@ msgstr "转到今天(_T)"
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
 # calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3422
 # calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-#: calendar/gui/e-day-view.c: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)..."
 
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-calendar.xml.h:42
-#: 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 "发布忙闲信息(_P)"
@@ -9126,7 +9240,7 @@ msgstr "发布忙闲信息(_P)"
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
 # executive-summary/component/e-summary-url.c:80
-#: 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"
@@ -9134,7 +9248,7 @@ msgstr "配置 %s"
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
 # executive-summary/component/e-summary-url.c:80
-#: 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"
@@ -9142,15 +9256,15 @@ msgstr "配置 %s"
 # mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
 # mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-#: calendar/gui/e-day-view.c: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 "另存为(_S)..."
 
 # ui/evolution-event-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:7
-#: calendar/gui/e-day-view.c: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 "调度会议(_M)"
@@ -9158,7 +9272,7 @@ msgstr "调度会议(_M)"
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-day-view.c: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 "作为 iCalendar 转发(_C)"
@@ -9166,49 +9280,49 @@ msgstr "作为 iCalendar 转发(_C)"
 # calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-#: calendar/gui/e-day-view.c: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)"
 
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3457
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-#: calendar/gui/e-day-view.c: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 "删除该时间(_O)"
 
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
 # calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
 # calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
-#: calendar/gui/e-day-view.c: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 "删除所有事件(_A)"
 
 # shell/e-shell-view-menu.c:577
 # shell/e-shell-view-menu.c:577
 # shell/e-shell-view-menu.c:577
-#: 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 工具好像并未安装到系统中。"
 
 # shell/e-shell-view-menu.c:585
 # shell/e-shell-view-menu.c:585
 # shell/e-shell-view-menu.c:585
-#: 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:565
 # calendar/gui/e-itip-control.c:565
 # calendar/gui/e-itip-control.c:568
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "结束于：<b>"
@@ -9216,19 +9330,19 @@ msgstr "结束于：<b>"
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
-#: calendar/gui/e-itip-control.c: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:626 calendar/gui/e-itip-control.c:675
 # calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
 # calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#: calendar/gui/e-itip-control.c: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 信息"
 
@@ -9236,14 +9350,14 @@ msgstr "iCalendar 信息"
 # calendar/gui/e-itip-control.c:641
 # calendar/gui/e-itip-control.c:644
 #. 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:706 calendar/gui/e-itip-control.c:722
 # calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
 # calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-#: calendar/gui/e-itip-control.c: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 "未知的人"
 
@@ -9251,7 +9365,7 @@ msgstr "未知的人"
 # calendar/gui/e-itip-control.c:729
 # calendar/gui/e-itip-control.c:732
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -9260,14 +9374,14 @@ msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作�
 # calendar/gui/e-itip-control.c:745
 # calendar/gui/e-itip-control.c:745
 # calendar/gui/e-itip-control.c:748
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>无</i>"
 
 # calendar/gui/dialogs/event-page.glade.h:8
 # calendar/gui/dialogs/event-page.glade.h:8
 # calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "地理位置(_O)："
@@ -9275,7 +9389,7 @@ msgstr "地理位置(_O)："
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "状态："
 
@@ -9285,16 +9399,16 @@ msgstr "状态："
 # calendar/gui/e-meeting-model.c:824
 # calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
 # calendar/gui/e-meeting-model.c:824
-#: calendar/gui/e-itip-control.c: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:804
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:807
-#: 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 "暂时接受"
 
@@ -9304,9 +9418,9 @@ msgstr "暂时接受"
 # calendar/gui/e-meeting-model.c:825
 # calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
 # calendar/gui/e-meeting-model.c:825
-#: calendar/gui/e-itip-control.c: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 "否决"
 
@@ -9329,13 +9443,13 @@ msgstr "否决"
 # camel/providers/smtp/camel-smtp-transport.c:171
 # camel/providers/smtp/camel-smtp-transport.c:226
 # widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
-#: calendar/gui/e-itip-control.c: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 "未知"
@@ -9349,16 +9463,16 @@ msgstr "未知"
 # calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
 # calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c: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:787
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:790
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "更新"
 
@@ -9374,59 +9488,59 @@ msgstr "更新"
 # calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
 # calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
 # shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-#: calendar/gui/e-itip-control.c: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:803
 # calendar/gui/e-itip-control.c:803
 # calendar/gui/e-itip-control.c:806
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "接受"
 
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "暂时接受"
 
 # calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:808
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "否决"
 
 # calendar/gui/e-itip-control.c:819
 # calendar/gui/e-itip-control.c:819
 # calendar/gui/e-itip-control.c:822
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "发送忙闲信息"
 
 # calendar/gui/e-itip-control.c:832
 # calendar/gui/e-itip-control.c:832
 # calendar/gui/e-itip-control.c:835
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "更新应答者状态"
 
 # calendar/gui/e-itip-control.c:846
 # calendar/gui/e-itip-control.c:846
 # calendar/gui/e-itip-control.c:848
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "发送最新的信息"
 
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-#: calendar/gui/e-itip-control.c: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 "取消"
@@ -9434,7 +9548,7 @@ msgstr "取消"
 # calendar/gui/e-itip-control.c:875
 # calendar/gui/e-itip-control.c:875
 # calendar/gui/e-itip-control.c:909
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 发布了会议信息。"
@@ -9442,14 +9556,14 @@ msgstr "<b>%s</b> 发布了会议信息。"
 # calendar/gui/e-itip-control.c:876
 # calendar/gui/e-itip-control.c:876
 # calendar/gui/e-itip-control.c:910
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "会议信息"
 
 # calendar/gui/e-itip-control.c:880
 # calendar/gui/e-itip-control.c:880
 # calendar/gui/e-itip-control.c:914
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 请求您参加一个会议。"
@@ -9457,14 +9571,14 @@ msgstr "<b>%s</b> 请求您参加一个会议。"
 # calendar/gui/e-itip-control.c:881
 # calendar/gui/e-itip-control.c:881
 # calendar/gui/e-itip-control.c:915
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "会议建议"
 
 # calendar/gui/e-itip-control.c:885
 # calendar/gui/e-itip-control.c:885
 # calendar/gui/e-itip-control.c:919
-#: calendar/gui/e-itip-control.c: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> 希望加入到已存的会议。"
@@ -9472,14 +9586,14 @@ msgstr "<b>%s</b> 希望加入到已存的会议。"
 # calendar/gui/e-itip-control.c:886
 # calendar/gui/e-itip-control.c:886
 # calendar/gui/e-itip-control.c:920
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "会议更新"
 
 # calendar/gui/e-itip-control.c:890
 # calendar/gui/e-itip-control.c:890
 # calendar/gui/e-itip-control.c:924
-#: calendar/gui/e-itip-control.c: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> 想收到最新的会议信息。"
@@ -9487,14 +9601,14 @@ msgstr "<b>%s</b> 想收到最新的会议信息。"
 # calendar/gui/e-itip-control.c:891
 # calendar/gui/e-itip-control.c:891
 # calendar/gui/e-itip-control.c:925
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "会议更新请求"
 
 # calendar/gui/e-itip-control.c:895
 # calendar/gui/e-itip-control.c:895
 # calendar/gui/e-itip-control.c:948
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已回复一个会议请求。"
@@ -9502,14 +9616,14 @@ msgstr "<b>%s</b> 已回复一个会议请求。"
 # calendar/gui/e-itip-control.c:896
 # calendar/gui/e-itip-control.c:896
 # calendar/gui/e-itip-control.c:949
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "会议答复"
 
 # calendar/gui/e-itip-control.c:900
 # calendar/gui/e-itip-control.c:900
 # calendar/gui/e-itip-control.c:953
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> 取消了一个会议。"
@@ -9517,7 +9631,7 @@ msgstr "<b>%s</b> 取消了一个会议。"
 # calendar/gui/e-itip-control.c:901
 # calendar/gui/e-itip-control.c:901
 # calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "会议取消"
 
@@ -9527,8 +9641,8 @@ msgstr "会议取消"
 # calendar/gui/e-itip-control.c:990
 # calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
 # calendar/gui/e-itip-control.c:1064
-#: calendar/gui/e-itip-control.c: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> 发送了一个无法理解的信息。"
@@ -9536,14 +9650,14 @@ msgstr "<b>%s</b> 发送了一个无法理解的信息。"
 # calendar/gui/e-itip-control.c:906
 # calendar/gui/e-itip-control.c:906
 # calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "错误的会议信息"
 
 # calendar/gui/e-itip-control.c:925
 # calendar/gui/e-itip-control.c:925
 # calendar/gui/e-itip-control.c:979
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 发布了任务信息。"
@@ -9551,14 +9665,14 @@ msgstr "<b>%s</b> 发布了任务信息。"
 # calendar/gui/e-itip-control.c:926
 # calendar/gui/e-itip-control.c:926
 # calendar/gui/e-itip-control.c:980
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "任务信息"
 
 # calendar/gui/e-itip-control.c:930
 # calendar/gui/e-itip-control.c:930
 # calendar/gui/e-itip-control.c:984
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 请求您完成一个任务。"
@@ -9566,14 +9680,14 @@ msgstr "<b>%s</b> 请求您完成一个任务。"
 # calendar/gui/e-itip-control.c:931
 # calendar/gui/e-itip-control.c:931
 # calendar/gui/e-itip-control.c:985
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "任务建议"
 
 # calendar/gui/e-itip-control.c:935
 # calendar/gui/e-itip-control.c:935
 # calendar/gui/e-itip-control.c:989
-#: calendar/gui/e-itip-control.c: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> 希望加入到已存在的任务。"
@@ -9581,14 +9695,14 @@ msgstr "<b>%s<b> 希望加入到已存在的任务。"
 # calendar/gui/e-itip-control.c:936
 # calendar/gui/e-itip-control.c:936
 # calendar/gui/e-itip-control.c:990
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "任务更新"
 
 # calendar/gui/e-itip-control.c:940
 # calendar/gui/e-itip-control.c:940
 # calendar/gui/e-itip-control.c:994
-#: calendar/gui/e-itip-control.c: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> 希望获取最新的任务信息。"
@@ -9596,14 +9710,14 @@ msgstr "<b>%s</b> 希望获取最新的任务信息。"
 # calendar/gui/e-itip-control.c:941
 # calendar/gui/e-itip-control.c:941
 # calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "任务更新请求"
 
 # calendar/gui/e-itip-control.c:945
 # calendar/gui/e-itip-control.c:945
 # calendar/gui/e-itip-control.c:1019
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已经回复了任务委派。"
@@ -9611,14 +9725,14 @@ msgstr "<b>%s</b> 已经回复了任务委派。"
 # calendar/gui/e-itip-control.c:946
 # calendar/gui/e-itip-control.c:946
 # calendar/gui/e-itip-control.c:1020
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "任务回复"
 
 # calendar/gui/e-itip-control.c:950
 # calendar/gui/e-itip-control.c:950
 # calendar/gui/e-itip-control.c:1024
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> 取消了任务。"
@@ -9626,21 +9740,21 @@ msgstr "<b>%s</b> 取消了任务。"
 # calendar/gui/e-itip-control.c:951
 # calendar/gui/e-itip-control.c:951
 # calendar/gui/e-itip-control.c:1025
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "任务取消"
 
 # calendar/gui/e-itip-control.c:956
 # calendar/gui/e-itip-control.c:956
 # calendar/gui/e-itip-control.c:1030
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "错误的任务邮件"
 
 # calendar/gui/e-itip-control.c:975
 # calendar/gui/e-itip-control.c:975
 # calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 发布了忙闲信息。"
@@ -9648,14 +9762,14 @@ msgstr "<b>%s</b> 发布了忙闲信息。"
 # calendar/gui/e-itip-control.c:976
 # calendar/gui/e-itip-control.c:976
 # calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "忙闲信息"
 
 # calendar/gui/e-itip-control.c:980
 # calendar/gui/e-itip-control.c:980
 # calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 请求您的忙闲信息。"
@@ -9663,14 +9777,14 @@ msgstr "<b>%s</b> 请求您的忙闲信息。"
 # calendar/gui/e-itip-control.c:981
 # calendar/gui/e-itip-control.c:981
 # calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "忙闲请求"
 
 # calendar/gui/e-itip-control.c:985
 # calendar/gui/e-itip-control.c:985
 # calendar/gui/e-itip-control.c:1059
-#: calendar/gui/e-itip-control.c: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> 应答了忙闲请求。"
@@ -9678,136 +9792,148 @@ msgstr "<b>%s</b> 应答了忙闲请求。"
 # calendar/gui/e-itip-control.c:986
 # calendar/gui/e-itip-control.c:986
 # calendar/gui/e-itip-control.c:1060
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "忙闲应答"
 
 # calendar/gui/e-itip-control.c:991
 # calendar/gui/e-itip-control.c:991
 # calendar/gui/e-itip-control.c:1065
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "错误的忙闲信息"
 
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c: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:1083
 # calendar/gui/e-itip-control.c:1083
 # calendar/gui/e-itip-control.c:1157
-#: 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:1111 calendar/gui/e-itip-control.c:1117
 # calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
 # calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-#: calendar/gui/e-itip-control.c: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:1142
 # calendar/gui/e-itip-control.c:1142
 # calendar/gui/e-itip-control.c:1216
-#: 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:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c: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/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1493
+#: 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:1243
 # calendar/gui/e-itip-control.c:1243
 # calendar/gui/e-itip-control.c:1317
-#: 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:1241
 # calendar/gui/e-itip-control.c:1241
 # calendar/gui/e-itip-control.c:1315
-#: 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:1300
 # calendar/gui/e-itip-control.c:1300
 # calendar/gui/e-itip-control.c:1374
-#: 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:1288
 # calendar/gui/e-itip-control.c:1288
 # calendar/gui/e-itip-control.c:1362
-#: 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/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1493
+#: 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:1298
 # calendar/gui/e-itip-control.c:1298
 # calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "更新参与者状态\n"
 
 # calendar/gui/e-itip-control.c:1296
 # calendar/gui/e-itip-control.c:1296
 # calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "无法更新参与者状态！\n"
 
 # calendar/gui/e-itip-control.c:1328
 # calendar/gui/e-itip-control.c:1328
 # calendar/gui/e-itip-control.c:1402
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "删除完成"
 
 # calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
 # calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
 # calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
-#: calendar/gui/e-itip-control.c: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:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c: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"
 
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "选择文件夹"
@@ -9815,7 +9941,7 @@ msgstr "选择文件夹"
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "选择文件夹"
@@ -9894,7 +10020,7 @@ msgstr "主席人员"
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1550
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "必需的参与者"
 
@@ -9923,7 +10049,7 @@ msgstr "资源"
 # calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
 # calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c: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 "个人"
 
@@ -9934,7 +10060,7 @@ msgstr "个人"
 # calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
 # calendar/gui/e-meeting-model.c:779
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "组"
 
@@ -9945,7 +10071,7 @@ msgstr "组"
 # calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 # calendar/gui/e-meeting-model.c:780
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr "资源"
 
@@ -9956,7 +10082,7 @@ msgstr "资源"
 # calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
 # calendar/gui/e-meeting-model.c:781
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "房间"
 
@@ -9967,7 +10093,7 @@ msgstr "房间"
 # calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
 # calendar/gui/e-meeting-model.c:794
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "主席"
 
@@ -9978,7 +10104,7 @@ msgstr "主席"
 # calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
 # calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c: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 "必需的参与者"
 
@@ -9989,7 +10115,7 @@ msgstr "必需的参与者"
 # calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
 # calendar/gui/e-meeting-model.c:796
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr "可选的参与者"
 
@@ -10000,7 +10126,7 @@ msgstr "可选的参与者"
 # calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
 # calendar/gui/e-meeting-model.c:797
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr "不参加"
 
@@ -10011,7 +10137,7 @@ msgstr "不参加"
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
 #: 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 "暂时的"
 
@@ -10022,7 +10148,7 @@ msgstr "暂时的"
 # calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
 # calendar/gui/e-meeting-model.c:827
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "被委任的"
 
@@ -10184,8 +10310,8 @@ msgstr "会议结束时间(_E)："
 # calendar/gui/e-tasks.c:328
 # calendar/gui/e-tasks.c:328
 # calendar/gui/e-tasks.c:342
-#: calendar/gui/e-tasks.c: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 打开任务"
@@ -10193,7 +10319,7 @@ msgstr "在 %s 打开任务"
 # calendar/gui/e-tasks.c:355
 # calendar/gui/e-tasks.c:355
 # calendar/gui/e-tasks.c:367
-#: calendar/gui/e-tasks.c: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”中装入任务"
@@ -10201,7 +10327,7 @@ msgstr "无法从“%s”中装入任务"
 # calendar/gui/e-tasks.c:367
 # calendar/gui/e-tasks.c:367
 # calendar/gui/e-tasks.c:379
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "不支持装入“%s”必需的方法"
@@ -10209,15 +10335,25 @@ msgstr "不支持装入“%s”必需的方法"
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-tasks.c: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”中的文件夹"
 
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:466
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "启动 %s 错误"
+
 # calendar/gui/e-calendar-table.etspec.h:8
 # calendar/gui/e-calendar-table.etspec.h:8
 # calendar/gui/e-calendar-table.etspec.h:8
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "完成日期"
@@ -10228,7 +10364,7 @@ msgstr "完成日期"
 # calendar/gui/e-week-view.c:1824
 # calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
 # calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "删除选中的对象"
@@ -10236,14 +10372,14 @@ msgstr "删除选中的对象"
 # mail/mail-ops.c:1556
 # mail/mail-ops.c:1558
 # calendar/gui/e-tasks.c:629
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "正在删除"
 
 # calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
 # calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
 # calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
@@ -10263,7 +10399,16 @@ msgstr "无法打开“%s”中的文件夹"
 msgid "The method required to open `%s' is not supported"
 msgstr "不支持打开“%s”必需的方法"
 
-#: calendar/gui/gnome-cal.c:1734
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c: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"
@@ -10271,7 +10416,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"
@@ -10282,7 +10427,7 @@ msgstr ""
 # calendar/gui/gnome-cal.c:1865
 # calendar/gui/gnome-cal.c:1865
 # calendar/gui/gnome-cal.c:1859
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "从 %s 打开日历"
@@ -10290,7 +10435,7 @@ msgstr "从 %s 打开日历"
 # mail/mail-ops.c:1234
 # mail/mail-ops.c:1236
 # mail/mail-ops.c:1279
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "正在打开文件夹 %s"
@@ -10393,59 +10538,59 @@ msgstr "十月"
 msgid "September"
 msgstr "九月"
 
-# calendar/gui/itip-utils.c:243
-# calendar/gui/itip-utils.c:243
-# calendar/gui/itip-utils.c:243
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "至少需要一个参加者"
-
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
-#: 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:243
+# calendar/gui/itip-utils.c:243
+# calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "至少需要一个参加者"
+
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "事件信息"
 
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "任务信息"
 
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "日志信息"
 
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "忙闲信息"
 
 # calendar/gui/itip-utils.c:321
 # calendar/gui/itip-utils.c:321
 # calendar/gui/itip-utils.c:321
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "日历信息"
 
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:790
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "更新"
@@ -10453,19 +10598,34 @@ msgstr "更新"
 # ui/evolution-subscribe.xml.h:3
 # ui/evolution-subscribe.xml.h:3
 # ui/evolution-subscribe.xml.h:3
-#: 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:370
+# calendar/gui/itip-utils.c:370
+# calendar/gui/itip-utils.c:370
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "忙闲信息 (%s 到 %s)"
+
+# calendar/gui/itip-utils.c:382
+# calendar/gui/itip-utils.c:382
+# calendar/gui/itip-utils.c:382
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "iCalendar 信息"
+
 # calendar/gui/itip-utils.c:573
 # calendar/gui/itip-utils.c:573
 # calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的参与者。"
 
@@ -10909,7 +11069,7 @@ msgstr "打印日历"
 # mail/mail-callbacks.c:2597 my-evolution/e-summary.c:605
 # ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c: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 "打印预览"
@@ -10946,7 +11106,7 @@ msgstr "要显示的任务文件夹的 URI"
 # mail/mail-callbacks.c:2135
 # mail/mail-callbacks.c:2254
 # calendar/gui/tasks-control.c:434
-#: 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"
@@ -10960,15 +11120,15 @@ msgstr ""
 # mail/mail-callbacks.c:2142
 # mail/mail-callbacks.c:2261
 # calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c: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 "不要再次询问。"
 
 # addressbook/printing/e-contact-print.c:1111
 # addressbook/printing/e-contact-print.c:1111
 # addressbook/printing/e-contact-print.c:1115
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "打印卡片"
@@ -11081,7 +11241,7 @@ msgstr "无法连接到存储： %s"
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "提醒"
@@ -11089,7 +11249,7 @@ msgstr "提醒"
 # calendar/gui/e-itip-control.glade.h:4
 # calendar/gui/e-itip-control.glade.h:4
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "日历消息"
@@ -11097,7 +11257,7 @@ msgstr "日历消息"
 # importers/pine-importer.c:663
 # importers/pine-importer.c:663
 # importers/pine-importer.c:663
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -11112,7 +11272,7 @@ msgstr ""
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "日历"
@@ -11120,133 +11280,133 @@ msgstr "日历"
 # calendar/pcs/query.c:246
 # calendar/pcs/query.c:246
 # calendar/pcs/query.c:246
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now 需要 0 个参数"
 
 # calendar/pcs/query.c:270
 # calendar/pcs/query.c:270
 # calendar/pcs/query.c:270
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time 需要 1 个参数"
 
 # calendar/pcs/query.c:275
 # calendar/pcs/query.c:275
 # calendar/pcs/query.c:275
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time 的第一个参数应该是字符串"
 
 # calendar/pcs/query.c:283
 # calendar/pcs/query.c:283
 # calendar/pcs/query.c:283
-#: 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 的第一个参数必须是 ISO 8601 日期/时间字符串"
 
 # calendar/pcs/query.c:312
 # calendar/pcs/query.c:312
 # calendar/pcs/query.c:312
-#: 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:317
 # calendar/pcs/query.c:317
 # calendar/pcs/query.c:317
-#: 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 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:324
 # calendar/pcs/query.c:324
 # calendar/pcs/query.c:324
-#: 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 的第二个参数应该是整数"
 
 # calendar/pcs/query.c:351
 # calendar/pcs/query.c:351
 # calendar/pcs/query.c:351
-#: 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:356
 # calendar/pcs/query.c:356
 # calendar/pcs/query.c:356
-#: 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 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:383
 # calendar/pcs/query.c:383
 # calendar/pcs/query.c:383
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end 需要一个参数"
 
 # calendar/pcs/query.c:388
 # calendar/pcs/query.c:388
 # calendar/pcs/query.c:388
-#: 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 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:424
 # calendar/pcs/query.c:424
 # calendar/pcs/query.c:424
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype 需要 0 个参数"
 
 # calendar/pcs/query.c:520
 # calendar/pcs/query.c:520
 # calendar/pcs/query.c:520
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? 需要两个参数"
 
 # calendar/pcs/query.c:525
 # calendar/pcs/query.c:525
 # calendar/pcs/query.c:525
-#: 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"
 
 # calendar/pcs/query.c:532
 # calendar/pcs/query.c:532
 # calendar/pcs/query.c:532
-#: 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-rang? 的第二个参数应该是 time_t"
 
 # calendar/pcs/query.c:662
 # calendar/pcs/query.c:662
 # calendar/pcs/query.c:662
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? 需要 2 个参数"
 
 # calendar/pcs/query.c:667
 # calendar/pcs/query.c:667
 # calendar/pcs/query.c:667
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? 的第一个参数应该是字符串"
 
 # calendar/pcs/query.c:674
 # calendar/pcs/query.c:674
 # calendar/pcs/query.c:674
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? 的第二个参数应该是字符串"
 
 # calendar/pcs/query.c:691
 # calendar/pcs/query.c:691
 # calendar/pcs/query.c:691
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -11255,14 +11415,14 @@ msgstr "contains? 的第一个参数必须是“任意”、“概要”、“�
 # calendar/pcs/query.c:733
 # calendar/pcs/query.c:733
 # calendar/pcs/query.c:733
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? 至少需要 1 个参数"
 
 # calendar/pcs/query.c:745
 # calendar/pcs/query.c:745
 # calendar/pcs/query.c:745
-#: 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)"
@@ -11271,31 +11431,39 @@ msgstr "has-categories? 的所有参数都应该为字符串或者它唯一的�
 # calendar/pcs/query.c:833
 # calendar/pcs/query.c:833
 # calendar/pcs/query.c:833
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? 需要 0 个参数"
 
 # calendar/pcs/query.c:878
 # calendar/pcs/query.c:878
 # calendar/pcs/query.c:878
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? 需要 1 个参数"
 
 # calendar/pcs/query.c:883
 # calendar/pcs/query.c:883
 # calendar/pcs/query.c:883
-#: 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"
 
 # calendar/pcs/query.c:1160
 # calendar/pcs/query.c:1160
 # calendar/pcs/query.c:1160
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "计算搜索表达式没有得到布尔值"
 
+# addressbook/gui/widgets/e-addressbook-util.c:41
+# addressbook/gui/widgets/e-addressbook-util.c:41
+# addressbook/gui/widgets/e-addressbook-util.c:41
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "其它错误"
+
 # calendar/zones.h:7
 # calendar/zones.h:7
 #.
@@ -13795,14 +13963,14 @@ msgstr "您必需在线工作以便完成该操作"
 # camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
 # camel/camel-filter-driver.c:602 camel/camel-filter-driver.c:611
 # camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
-#: camel/camel-filter-driver.c: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:921
 # camel/camel-filter-driver.c:970
 # camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
-#: 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"
@@ -13810,7 +13978,7 @@ msgstr "解析过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:927
 # camel/camel-filter-driver.c:976
 # camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
-#: camel/camel-filter-driver.c: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"
@@ -13818,21 +13986,21 @@ msgstr "执行过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:664
 # camel/camel-filter-driver.c:713
 # camel/camel-filter-driver.c:865
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "无法打开脱机文件夹"
 
 # camel/camel-filter-driver.c:673
 # camel/camel-filter-driver.c:722
 # camel/camel-filter-driver.c:874
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "无法处理脱机文件夹"
 
 # camel/camel-filter-driver.c:688
 # camel/camel-filter-driver.c:737
 # camel/camel-filter-driver.c:889
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "获取邮件 %d (%d%%)"
@@ -13840,14 +14008,14 @@ msgstr "获取邮件 %d (%d%%)"
 # camel/camel-filter-driver.c:692
 # camel/camel-filter-driver.c:741
 # camel/camel-filter-driver.c:893
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "无法打开消息"
 
 # camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
 # camel/camel-filter-driver.c:742 camel/camel-filter-driver.c:754
 # camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
-#: camel/camel-filter-driver.c: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 失败"
@@ -13855,14 +14023,14 @@ msgstr "在消息 %d 失败"
 # camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
 # camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
 # camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c: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:789
 # camel/camel-filter-driver.c:838
 # camel/camel-filter-driver.c:988
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在获取第 %d 个消息，共 %d 个"
@@ -13870,7 +14038,7 @@ msgstr "正在获取第 %d 个消息，共 %d 个"
 # camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
 # camel/camel-filter-driver.c:843 camel/camel-filter-driver.c:861
 # camel/camel-filter-driver.c:1003
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d 个消息失败，共 %d 个"
@@ -13878,14 +14046,14 @@ msgstr "在第 %d 个消息失败，共 %d 个"
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-filter-search.c:126
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "检索消息失败。"
 
 # shell/e-shell.c:1886
 # shell/e-shell.c:1886
 # shell/e-shell.c:1887
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "无效参数"
@@ -13893,7 +14061,7 @@ msgstr "无效参数"
 # shell/e-shell.c:1886
 # shell/e-shell.c:1886
 # shell/e-shell.c:1887
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "无效参数"
@@ -13910,7 +14078,7 @@ msgstr "无效参数"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "缓冲邮件 %s 失败： %s"
@@ -13927,7 +14095,7 @@ msgstr "缓冲邮件 %s 失败： %s"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-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"
@@ -13935,7 +14103,7 @@ msgstr "缓冲邮件 %s 失败： %s"
 # camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
 # camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
 # camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
-#: camel/camel-filter-search.c: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"
@@ -14006,14 +14174,14 @@ msgstr "不支持的操作：按 uid 搜索：搜索 %s"
 # camel/camel-folder.c:1262
 # camel/camel-folder.c:1262
 # camel/camel-folder.c:1262
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "正在移动邮件"
 
 # mail/mail-ops.c:868
 # mail/mail-ops.c:870
 # mail/mail-ops.c:913
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "把邮件复制到 %s"
@@ -14511,7 +14679,7 @@ msgstr ""
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:495
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
@@ -14600,7 +14768,7 @@ msgstr "常规表达式编译失败： %s： %s"
 # camel/camel-service.c:157
 # camel/camel-service.c:157
 # camel/camel-service.c:157
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL “%s” 需要用户名组件"
@@ -14608,7 +14776,7 @@ msgstr "URL “%s” 需要用户名组件"
 # camel/camel-service.c:165
 # camel/camel-service.c:165
 # camel/camel-service.c:165
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL “%s” 需要主机组件"
@@ -14616,7 +14784,7 @@ msgstr "URL “%s” 需要主机组件"
 # camel/camel-service.c:173
 # camel/camel-service.c:173
 # camel/camel-service.c:173
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL “%s” 需要路径组件"
@@ -14624,7 +14792,7 @@ msgstr "URL “%s” 需要路径组件"
 # camel/camel-service.c:611
 # camel/camel-service.c:614
 # camel/camel-service.c:614
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "正在解析： %s"
@@ -14632,7 +14800,7 @@ msgstr "正在解析： %s"
 # camel/camel-service.c:638
 # camel/camel-service.c:641
 # camel/camel-service.c:641
-#: 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"
@@ -14640,7 +14808,7 @@ msgstr "域名寻找失败： %s"
 # camel/camel-service.c:663
 # camel/camel-service.c:666
 # camel/camel-service.c:666
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "主机寻找失败： %s： 没有找到主机"
@@ -14648,7 +14816,7 @@ msgstr "主机寻找失败： %s： 没有找到主机"
 # camel/camel-service.c:665
 # camel/camel-service.c:668
 # camel/camel-service.c:668
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "主机寻找失败： %s： 未知的原因"
@@ -14656,7 +14824,7 @@ msgstr "主机寻找失败： %s： 未知的原因"
 # camel/camel-service.c:611
 # camel/camel-service.c:614
 # camel/camel-service.c:614
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "正在解析： %s"
@@ -14664,7 +14832,7 @@ msgstr "正在解析： %s"
 # camel/camel-service.c:663
 # camel/camel-service.c:666
 # camel/camel-service.c:666
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "主机寻找失败： %s： 没有找到主机"
@@ -14672,7 +14840,7 @@ msgstr "主机寻找失败： %s： 没有找到主机"
 # camel/camel-service.c:665
 # camel/camel-service.c:668
 # camel/camel-service.c:668
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "主机寻找失败： %s： 未知的原因"
@@ -14950,7 +15118,7 @@ msgid "Error in application verification"
 msgstr ""
 
 # camel/camel-tcp-stream-ssl.c:438
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -14964,12 +15132,12 @@ msgstr ""
 "签名：           %s"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: 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-ssl.c:444
-#: 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 "坏"
 
@@ -14997,7 +15165,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-ssl.c:447
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -15088,10 +15256,10 @@ msgstr "无法重命名文件夹： %s： 没有该文件夹"
 # camel/camel-remote-store.c:481
 # camel/providers/imap/camel-imap-command.c:228
 # camel/providers/imap/camel-imap-command.c:409
-#: 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 "操作已取消"
 
@@ -15101,8 +15269,8 @@ msgstr "操作已取消"
 # camel/providers/imap/camel-imap-command.c:274
 # camel/camel-remote-store.c:484
 # camel/providers/imap/camel-imap-command.c:274
-#: 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"
@@ -15110,7 +15278,18 @@ msgstr "服务器意外地中止了连接： %s"
 # camel/providers/imap/camel-imap-command.c:352
 # camel/providers/imap/camel-imap-command.c:352
 # camel/providers/imap/camel-imap-command.c:352
-#: 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:352
+# camel/providers/imap/camel-imap-command.c:352
+# camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "来自 IMAP 服务器的意外应答： %s"
@@ -15118,7 +15297,7 @@ msgstr "来自 IMAP 服务器的意外应答： %s"
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP 命令失败： %s"
@@ -15126,14 +15305,14 @@ msgstr "IMAP 命令失败： %s"
 # camel/providers/imap/camel-imap-command.c:417
 # camel/providers/imap/camel-imap-command.c:417
 # camel/providers/imap/camel-imap-command.c:417
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "服务器应答结束太快。"
 
 # camel/providers/imap/camel-imap-command.c:608
 # camel/providers/imap/camel-imap-command.c:608
 # camel/providers/imap/camel-imap-command.c:610
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP 服务器应答不含有 %s 信息"
@@ -15141,7 +15320,7 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
 # camel/providers/imap/camel-imap-command.c:644
 # camel/providers/imap/camel-imap-command.c:644
 # camel/providers/imap/camel-imap-command.c:646
-#: camel/providers/imap/camel-imap-command.c:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "来自 IMAP 服务器意外的 OK 应答： %s"
@@ -15149,7 +15328,7 @@ msgstr "来自 IMAP 服务器意外的 OK 应答： %s"
 # camel/providers/imap/camel-imap-folder.c:194
 # camel/providers/imap/camel-imap-folder.c:194
 # camel/providers/imap/camel-imap-folder.c:197
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "无法创建目录 %s： %s"
@@ -15157,7 +15336,7 @@ msgstr "无法创建目录 %s： %s"
 # camel/providers/imap/camel-imap-folder.c:213
 # camel/providers/imap/camel-imap-folder.c:213
 # camel/providers/imap/camel-imap-folder.c:216
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "无法为 %s 装入概要"
@@ -15165,7 +15344,7 @@ msgstr "无法为 %s 装入概要"
 # camel/providers/imap/camel-imap-folder.c:277
 # camel/providers/imap/camel-imap-folder.c:277
 # camel/providers/imap/camel-imap-folder.c:282
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 msgid "Folder was destroyed and recreated on server."
 msgstr "文件夹已被删除并在服务器上重建了。"
 
@@ -15173,14 +15352,14 @@ msgstr "文件夹已被删除并在服务器上重建了。"
 # camel/providers/imap/camel-imap-folder.c:461
 # camel/providers/imap/camel-imap-folder.c:466
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "正在扫描改变了的邮件"
 
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-filter-search.c:126
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "检索消息失败。"
@@ -15209,7 +15388,7 @@ msgstr "检索消息失败。"
 # camel/providers/local/camel-mh-folder.c:207
 # camel/providers/local/camel-mh-folder.c:215
 # camel/providers/local/camel-spool-folder.c:579
-#: camel/providers/imap/camel-imap-folder.c: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
@@ -15237,7 +15416,7 @@ msgstr ""
 # camel/providers/local/camel-mbox-folder.c:331
 # camel/providers/local/camel-mh-folder.c:198
 # camel/providers/local/camel-spool-folder.c:579
-#: camel/providers/imap/camel-imap-folder.c: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
@@ -15250,8 +15429,8 @@ msgstr "没有该邮件"
 # camel/providers/imap/camel-imap-folder.c:2001
 # camel/providers/imap/camel-imap-folder.c:1632
 # camel/providers/imap/camel-imap-folder.c:2108
-#: camel/providers/imap/camel-imap-folder.c: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 "该邮件目前不可用"
 
@@ -15261,22 +15440,15 @@ msgstr "该邮件目前不可用"
 # camel/providers/imap/camel-imap-folder.c:1821
 # camel/providers/imap/camel-imap-folder.c:1787
 # camel/providers/imap/camel-imap-folder.c:1861
-#: camel/providers/imap/camel-imap-folder.c: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:1746
-# camel/providers/imap/camel-imap-folder.c:1746
-# camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "正在扫描新邮件"
-
 # camel/providers/imap/camel-imap-folder.c:2038
 # camel/providers/imap/camel-imap-folder.c:2038
 # camel/providers/imap/camel-imap-folder.c:2145
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "无法在 FETCH 应答中找到邮件体。"
 
@@ -15308,6 +15480,23 @@ msgstr "无法打开缓冲器目录： %s"
 msgid "Failed to cache message %s: %s"
 msgstr "缓冲邮件 %s 失败： %s"
 
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/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
 # camel/providers/imap/camel-imap-provider.c:43
 # camel/providers/imap/camel-imap-provider.c:43
@@ -15396,7 +15585,7 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:565
-#: 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"
@@ -15404,7 +15593,7 @@ msgstr "SMTP 服务器 %s"
 # camel/camel-remote-store.c:207
 # camel/camel-remote-store.c:207
 # camel/camel-remote-store.c:207
-#: 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"
@@ -15412,7 +15601,7 @@ msgstr "%s 为 %s 服务，在 %s"
 # camel/camel-remote-store.c:264
 # camel/camel-remote-store.c:264
 # camel/camel-remote-store.c:264
-#: camel/providers/imap/camel-imap-store.c: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
@@ -15425,9 +15614,9 @@ msgstr "连接已取消"
 # camel/providers/smtp/camel-smtp-transport.c:273
 # camel/camel-remote-store.c:267
 # camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/providers/imap/camel-imap-store.c: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"
@@ -15435,8 +15624,8 @@ msgstr "无法连接到 %s (端口 %d)： %s"
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/imap/camel-imap-store.c: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 ""
@@ -15446,7 +15635,7 @@ msgstr ""
 # shell/e-storage.c:518
 # shell/e-storage.c:518
 # shell/e-storage.c:518
-#: 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."
@@ -15455,24 +15644,16 @@ msgstr "不支持的操作"
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-#: 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 "认证失败。"
 
-# shell/e-storage.c:510
-# shell/e-storage.c:510
-# shell/e-storage.c:510
-#: 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:518
 # camel/providers/imap/camel-imap-store.c:518
 # camel/providers/imap/camel-imap-store.c:518
-#: 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"
@@ -15483,8 +15664,8 @@ msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
 # camel/providers/smtp/camel-smtp-transport.c:389
 # camel/providers/imap/camel-imap-store.c:528
 # camel/providers/smtp/camel-smtp-transport.c:393
-#: camel/providers/imap/camel-imap-store.c: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"
@@ -15492,7 +15673,7 @@ msgstr "不支持验证类型 %s"
 # camel/providers/imap/camel-imap-store.c:552
 # camel/providers/imap/camel-imap-store.c:552
 # camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -15503,15 +15684,15 @@ msgstr "%s请为 %s@%s 输入 IMAP 密码"
 # camel/providers/smtp/camel-smtp-transport.c:430
 # camel/providers/imap/camel-imap-store.c:567
 # camel/providers/smtp/camel-smtp-transport.c:434
-#: camel/providers/imap/camel-imap-store.c: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:596
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
-#: 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"
@@ -15525,8 +15706,8 @@ msgstr ""
 # camel/providers/imap/camel-imap-store.c:899
 # camel/providers/imap/camel-imap-store.c:899
 # camel/providers/imap/camel-imap-store.c:900
-#: camel/providers/imap/camel-imap-store.c: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"
@@ -15534,7 +15715,7 @@ msgstr "没有文件夹 %s"
 # shell/e-shell-utils.c:121
 # shell/e-shell-utils.c:121
 # shell/e-shell-utils.c:121
-#: camel/providers/imap/camel-imap-store.c: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\""
@@ -15549,7 +15730,7 @@ msgstr "文件夹名不能含有回车符。"
 # camel/providers/local/camel-mbox-summary.c:873
 # camel/providers/local/camel-spool-summary.c:544
 # camel/providers/local/camel-spool-summary.c:1110
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知的错误： %s"
@@ -15557,7 +15738,7 @@ msgstr "未知的错误： %s"
 # camel/providers/imap/camel-imap-store.c:1274
 # camel/providers/imap/camel-imap-store.c:1274
 # camel/providers/imap/camel-imap-store.c:1275
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "父文件夹不允许含有子文件夹"
 
@@ -15681,8 +15862,8 @@ msgstr "在标准邮件箱文件中读取和存储本地邮件。"
 # camel/providers/local/camel-local-store.c:227
 # camel/providers/local/camel-spool-store.c:109
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c: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 不是绝对路径"
@@ -15706,7 +15887,7 @@ msgstr "存储根目录 %s 不是普通目录"
 # camel/providers/local/camel-local-store.c:235
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "无法获取文件夹： %s： %s"
@@ -15729,7 +15910,7 @@ msgstr "本地邮件文件 %s"
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
-#: camel/providers/local/camel-local-store.c: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"
@@ -15737,7 +15918,7 @@ msgstr "无法将文件夹 %s 改名为 %s： %s"
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "无法重命名文件夹： %s"
@@ -15745,7 +15926,7 @@ msgstr "无法重命名文件夹： %s"
 # camel/providers/local/camel-local-store.c:374
 # camel/providers/local/camel-local-store.c:374
 # camel/providers/local/camel-local-store.c:374
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "无法删除文件夹概要文件 “%s”： %s"
@@ -15753,7 +15934,7 @@ msgstr "无法删除文件夹概要文件 “%s”： %s"
 # camel/providers/local/camel-local-store.c:384
 # camel/providers/local/camel-local-store.c:384
 # camel/providers/local/camel-local-store.c:384
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "无法删除文件夹索引文件 “%s”： %s"
@@ -15761,7 +15942,7 @@ msgstr "无法删除文件夹索引文件 “%s”： %s"
 # camel/providers/local/camel-local-summary.c:367
 # camel/providers/local/camel-local-summary.c:367
 # camel/providers/local/camel-local-summary.c:367
-#: 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"
@@ -15772,7 +15953,7 @@ msgstr "无法保存概要： %s： %s"
 # camel/providers/local/camel-spool-summary.c:1157
 # camel/providers/local/camel-local-summary.c:423
 # camel/providers/local/camel-spool-summary.c:1157
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr "无法将邮件添加到概要中： 未知的原因"
 
@@ -15810,6 +15991,7 @@ msgstr "无效的邮件内容"
 # camel/providers/local/camel-mh-store.c:89
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -15830,6 +16012,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "文件夹“%s”不存在。"
@@ -15842,6 +16025,7 @@ msgstr "文件夹“%s”不存在。"
 # camel/providers/local/camel-mh-store.c:102
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -15885,7 +16069,8 @@ msgstr "不是邮件目录"
 # camel/providers/local/camel-maildir-store.c:331
 # camel/providers/local/camel-maildir-store.c:331
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c: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"
@@ -15951,7 +16136,7 @@ msgstr "正在存储文件夹"
 # camel/providers/local/camel-mbox-folder.c:151
 # camel/providers/local/camel-spool-folder.c:274
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "无法在 %s 创建文件夹锁： %s"
@@ -16294,7 +16479,7 @@ msgstr "无法打开 MH 目录： %s： %s"
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "脱机文件夹无法改名"
@@ -16302,7 +16487,7 @@ msgstr "脱机文件夹无法改名"
 # camel/providers/local/camel-local-store.c:145
 # camel/providers/local/camel-local-store.c:145
 # camel/providers/local/camel-local-store.c:145
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "存储根目录 %s 不是普通目录"
@@ -16310,19 +16495,30 @@ msgstr "存储根目录 %s 不是普通目录"
 # camel/providers/local/camel-spool-store.c:141
 # camel/providers/local/camel-spool-store.c:141
 # camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spool-store.c: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-mbox-store.c:118
+# camel/providers/local/camel-mbox-store.c:145
+# camel/providers/local/camel-mbox-store.c:118
+# camel/providers/local/camel-mbox-store.c:145
+# camel/providers/local/camel-mbox-store.c:118
+# camel/providers/local/camel-mbox-store.c:145
+#: 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:163
 # camel/providers/local/camel-spool-store.c:163
 # camel/providers/local/camel-spool-store.c:163
-#: 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"
@@ -16330,7 +16526,7 @@ msgstr "脱机邮件文件 %s"
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "脱机文件夹无法改名"
@@ -16338,14 +16534,14 @@ msgstr "脱机文件夹无法改名"
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "脱机文件夹无法改名"
 
 # camel/providers/local/camel-spool-store.c:217
 # camel/providers/local/camel-spool-store.c:217
 # camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "脱机文件夹无法删除"
 
@@ -16507,7 +16703,7 @@ msgstr "操作失败：%s"
 # camel/providers/pop3/camel-pop3-folder.c:175
 # camel/providers/pop3/camel-pop3-folder.c:175
 # camel/providers/pop3/camel-pop3-folder.c:175
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "检索 POP 概要"
 
@@ -16520,10 +16716,10 @@ msgstr "检索 POP 概要"
 # camel/providers/imap/camel-imap-command.c:228
 # camel/providers/imap/camel-imap-command.c:409
 # camel/providers/nntp/camel-nntp-folder.c:157
-#: 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 "用户已取消"
 
@@ -16545,7 +16741,7 @@ msgstr "用户已取消"
 # camel/providers/local/camel-spool-folder.c:579
 # camel/providers/nntp/camel-nntp-folder.c:153
 # camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "无法获取消息 POP 摘要：%s"
@@ -16553,14 +16749,14 @@ msgstr "无法获取消息 POP 摘要：%s"
 # camel/providers/pop3/camel-pop3-folder.c:252
 # camel/providers/pop3/camel-pop3-folder.c:252
 # camel/providers/pop3/camel-pop3-folder.c:252
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "彻底去除已删除的邮件"
 
 # camel/providers/pop3/camel-pop3-folder.c:367
 # camel/providers/pop3/camel-pop3-folder.c:367
 # camel/providers/pop3/camel-pop3-folder.c:367
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, c-format
 msgid "No message with uid %s"
 msgstr "没有 uid 为 %s 的邮件"
@@ -16570,7 +16766,7 @@ msgstr "没有 uid 为 %s 的邮件"
 # camel/providers/pop3/camel-pop3-folder.c:371
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "检索 POP 邮件 %d"
@@ -16593,10 +16789,10 @@ msgstr "检索 POP 邮件 %d"
 # camel/providers/local/camel-spool-folder.c:579
 # camel/providers/nntp/camel-nntp-folder.c:153
 # camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c: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 "无法获取消息 %s：%s"
@@ -16604,7 +16800,7 @@ msgstr "无法获取消息 %s：%s"
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "未知原因"
 
@@ -17042,7 +17238,7 @@ msgstr "必须认证"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "QUIT 应答错误"
@@ -17050,8 +17246,8 @@ msgstr "QUIT 应答错误"
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/smtp/camel-smtp-transport.c: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 ""
@@ -17061,7 +17257,7 @@ msgstr ""
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1138
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "邮件的格式可能不正确"
@@ -17069,7 +17265,7 @@ msgstr "邮件的格式可能不正确"
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "RSET 请求超时： %s"
@@ -17077,7 +17273,7 @@ msgstr "RSET 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1104
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "DATA 应答错误"
@@ -17085,7 +17281,7 @@ msgstr "DATA 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:379
 # camel/providers/smtp/camel-smtp-transport.c:379
 # camel/providers/smtp/camel-smtp-transport.c:383
-#: camel/providers/smtp/camel-smtp-transport.c: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"
@@ -17093,7 +17289,7 @@ msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
 # camel/providers/smtp/camel-smtp-transport.c:417
 # camel/providers/smtp/camel-smtp-transport.c:417
 # camel/providers/smtp/camel-smtp-transport.c:421
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -17101,7 +17297,7 @@ msgstr "%s请为 %s@%s 输入 SMTP 密码"
 # camel/providers/smtp/camel-smtp-transport.c:438
 # camel/providers/smtp/camel-smtp-transport.c:438
 # camel/providers/smtp/camel-smtp-transport.c:442
-#: 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"
@@ -17115,7 +17311,7 @@ msgstr ""
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:565
-#: 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"
@@ -17123,7 +17319,7 @@ msgstr "SMTP 服务器 %s"
 # camel/providers/smtp/camel-smtp-transport.c:556
 # camel/providers/smtp/camel-smtp-transport.c:556
 # camel/providers/smtp/camel-smtp-transport.c:567
-#: 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 发送 SMTP 邮件"
@@ -17131,42 +17327,42 @@ msgstr "通过 %s 发送 SMTP 邮件"
 # camel/providers/smtp/camel-smtp-transport.c:588
 # camel/providers/smtp/camel-smtp-transport.c:588
 # camel/providers/smtp/camel-smtp-transport.c:598
-#: 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:593 mail/mail-ops.c:558
 # camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
 # camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c: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:604
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:614
-#: 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:604
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:624
-#: 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:684
 # camel/providers/smtp/camel-smtp-transport.c:684
 # camel/providers/smtp/camel-smtp-transport.c:798
-#: 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:1091
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1199
-#: 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"
@@ -17174,7 +17370,7 @@ msgstr "RSET 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET 应答错误"
@@ -17182,14 +17378,14 @@ msgstr "RSET 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:758
 # camel/providers/smtp/camel-smtp-transport.c:758
 # camel/providers/smtp/camel-smtp-transport.c:883
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP 认证"
 
 # camel/providers/smtp/camel-smtp-transport.c:764
 # camel/providers/smtp/camel-smtp-transport.c:764
 # camel/providers/smtp/camel-smtp-transport.c:889
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "创建 SASL 认证对象错误。"
 
@@ -17199,8 +17395,8 @@ msgstr "创建 SASL 认证对象错误。"
 # camel/providers/smtp/camel-smtp-transport.c:791
 # camel/providers/smtp/camel-smtp-transport.c:904
 # camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c: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"
@@ -17208,21 +17404,21 @@ msgstr "AUTH 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:800
 # camel/providers/smtp/camel-smtp-transport.c:800
 # camel/providers/smtp/camel-smtp-transport.c:925
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH 请求失败。"
 
 # camel/providers/smtp/camel-smtp-transport.c:848
 # camel/providers/smtp/camel-smtp-transport.c:848
 # camel/providers/smtp/camel-smtp-transport.c:973
-#: camel/providers/smtp/camel-smtp-transport.c: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:874
 # camel/providers/smtp/camel-smtp-transport.c:874
 # camel/providers/smtp/camel-smtp-transport.c:999
-#: 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： 邮件未发送"
@@ -17230,20 +17426,20 @@ msgstr "MAIL FROM 请求超时： %s： 邮件未发送"
 # camel/providers/smtp/camel-smtp-transport.c:893
 # camel/providers/smtp/camel-smtp-transport.c:893
 # camel/providers/smtp/camel-smtp-transport.c:1013
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM 应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:918
 # camel/providers/smtp/camel-smtp-transport.c:918
 # camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c: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:1054
-#: 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> 失败"
@@ -17251,7 +17447,7 @@ msgstr "RCPT TO <%s> 失败"
 # camel/providers/smtp/camel-smtp-transport.c:971
 # camel/providers/smtp/camel-smtp-transport.c:971
 # camel/providers/smtp/camel-smtp-transport.c:1090
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 请求超时： %s： 邮件未发送"
@@ -17262,7 +17458,7 @@ msgstr "DATA 请求超时： %s： 邮件未发送"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr "DATA 应答错误"
 
@@ -17272,8 +17468,8 @@ msgstr "DATA 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:1048
 # camel/providers/smtp/camel-smtp-transport.c:1144
 # camel/providers/smtp/camel-smtp-transport.c:1162
-#: camel/providers/smtp/camel-smtp-transport.c: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： 邮件未发送"
@@ -17283,14 +17479,14 @@ msgstr "DATA 发送超时： 消息终止： %s： 邮件未发送"
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:495
 # camel/providers/smtp/camel-smtp-transport.c:1176
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "DATA 终止应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 请求超时： %s"
@@ -17298,7 +17494,7 @@ msgstr "RSET 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "RSET 应答错误"
 
@@ -17308,7 +17504,7 @@ msgstr "RSET 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:791
 # camel/providers/smtp/camel-smtp-transport.c:904
 # camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH 请求超时： %s"
@@ -17316,75 +17512,60 @@ msgstr "AUTH 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "QUIT 应答错误"
 
-# composer/e-msg-composer-attachment-bar.c:101
-# composer/e-msg-composer-attachment-bar.c:101
-# composer/e-msg-composer-attachment-bar.c:101
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 字节"
-
-# composer/e-msg-composer-attachment-bar.c:103
-# composer/e-msg-composer-attachment-bar.c:103
-# composer/e-msg-composer-attachment-bar.c:103
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u 字节"
-
 # composer/e-msg-composer-attachment-bar.c:110
 # composer/e-msg-composer-attachment-bar.c:110
 # composer/e-msg-composer-attachment-bar.c:110
-#: composer/e-msg-composer-attachment-bar.c: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:114
 # composer/e-msg-composer-attachment-bar.c:114
 # composer/e-msg-composer-attachment-bar.c:114
-#: 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:118
 # composer/e-msg-composer-attachment-bar.c:118
 # composer/e-msg-composer-attachment-bar.c:118
-#: 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"
 
 # composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 # composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
 # composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c: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:500
 # composer/e-msg-composer-attachment-bar.c:506
 # composer/e-msg-composer-attachment-bar.c:506
-#: 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:531
 # composer/e-msg-composer-attachment-bar.c:537
 # composer/e-msg-composer-attachment-bar.c:537
-#: 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:532
 # composer/e-msg-composer-attachment-bar.c:538
 # composer/e-msg-composer-attachment-bar.c:538
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "把文件附件到邮件"
 
@@ -17443,7 +17624,7 @@ msgstr "建议自动显示附件"
 # composer/e-msg-composer-hdrs.c:327
 # composer/e-msg-composer-hdrs.c:327
 # composer/e-msg-composer-hdrs.c:326
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "点击此处以使用地址簿"
 
@@ -17457,7 +17638,7 @@ msgstr "点击此处以使用地址簿"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "回复到："
 
@@ -17467,7 +17648,7 @@ msgstr "回复到："
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "发件人："
 
@@ -17477,49 +17658,49 @@ 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:389
 # composer/e-msg-composer-hdrs.c:389
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "收信人："
 
 # composer/e-msg-composer-hdrs.c:390
 # composer/e-msg-composer-hdrs.c:390
 # composer/e-msg-composer-hdrs.c:388
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "输入邮件的收件人"
 
 # composer/e-msg-composer-hdrs.c:393
 # composer/e-msg-composer-hdrs.c:393
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "抄送："
 
 # composer/e-msg-composer-hdrs.c:394
 # composer/e-msg-composer-hdrs.c:394
 # composer/e-msg-composer-hdrs.c:392
-#: composer/e-msg-composer-hdrs.c: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:397
 # composer/e-msg-composer-hdrs.c:397
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "暗中抄送："
 
 # composer/e-msg-composer-hdrs.c:398
 # composer/e-msg-composer-hdrs.c:398
 # composer/e-msg-composer-hdrs.c:396
-#: composer/e-msg-composer-hdrs.c: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."
@@ -17531,7 +17712,7 @@ msgstr "输入将接收该邮件副本，但不出现在收件人列表中的收
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "波尔图"
@@ -17539,7 +17720,7 @@ msgstr "波尔图"
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # my-evolution/e-summary-calendar.c:395
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "无描述"
@@ -17566,7 +17747,7 @@ msgstr "无法创建 PGP 签名上下文。"
 # composer/e-msg-composer.c:743
 # composer/e-msg-composer.c:747
 # composer/e-msg-composer.c:695
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -17578,21 +17759,21 @@ msgstr ""
 # composer/e-msg-composer.c:952
 # composer/e-msg-composer.c:956
 # composer/e-msg-composer.c:921
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "警告！"
 
 # composer/e-msg-composer.c:956
 # composer/e-msg-composer.c:960
 # composer/e-msg-composer.c:925
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "文件存在，覆盖它？"
 
 # composer/e-msg-composer.c:978
 # composer/e-msg-composer.c:982
 # composer/e-msg-composer.c:947
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "保存文件错误： %s"
@@ -17600,7 +17781,7 @@ msgstr "保存文件错误： %s"
 # composer/e-msg-composer.c:997
 # composer/e-msg-composer.c:1001
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "读入文件错误： %s"
@@ -17608,7 +17789,7 @@ msgstr "读入文件错误： %s"
 # composer/e-msg-composer.c:1118
 # composer/e-msg-composer.c:1032
 # composer/e-msg-composer.c:997
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "访问文件错误： %s"
@@ -17616,14 +17797,14 @@ msgstr "访问文件错误： %s"
 # composer/e-msg-composer.c:1126
 # composer/e-msg-composer.c:1040
 # composer/e-msg-composer.c:1005
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "无法从编辑器检索邮件"
 
 # composer/e-msg-composer.c:1133
 # composer/e-msg-composer.c:1047
 # composer/e-msg-composer.c:1012
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -17635,7 +17816,7 @@ msgstr ""
 # composer/e-msg-composer.c:1140
 # composer/e-msg-composer.c:1054
 # composer/e-msg-composer.c:1019
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -17647,7 +17828,7 @@ msgstr ""
 # composer/e-msg-composer.c:1149
 # composer/e-msg-composer.c:1063
 # composer/e-msg-composer.c:1028
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -17659,7 +17840,7 @@ msgstr ""
 # composer/e-msg-composer.c:1251
 # composer/e-msg-composer.c:1165
 # composer/e-msg-composer.c:1130
-#: composer/e-msg-composer.c: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?"
@@ -17667,43 +17848,57 @@ msgstr ""
 "Ximian Evolution 发现上次会话含有未保存的文件。\n"
 "您是否希望恢复它们？"
 
+# composer/e-msg-composer.c:1405
+# composer/e-msg-composer.c:1322
+# composer/e-msg-composer.c:1288
+#: 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:1412
 # composer/e-msg-composer.c:1329
 # composer/e-msg-composer.c:1295
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "警告： 已改动的邮件"
 
 # composer/e-msg-composer.c:1435
 # composer/e-msg-composer.c:1352
 # composer/e-msg-composer.c:1318
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "打开文件"
 
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:88
-#: composer/e-msg-composer.c: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:1970 composer/e-msg-composer.c:2423
 # composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
 # composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: composer/e-msg-composer.c: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:2440
 # composer/e-msg-composer.c:2380
 # composer/e-msg-composer.c:2351
-#: 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."
@@ -17714,7 +17909,21 @@ msgstr ""
 # composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
 # composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
 # composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: composer/e-msg-composer.c: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:2463 composer/e-msg-composer.c:2518
+# composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
+# composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -17722,7 +17931,7 @@ 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>"
@@ -17731,7 +17940,7 @@ msgstr ""
 # composer/evolution-composer.c:367
 # composer/evolution-composer.c:367
 # composer/evolution-composer.c:367
-#: 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."
@@ -17742,8 +17951,9 @@ msgstr ""
 # composer/evolution-composer.c:382
 # composer/evolution-composer.c:382
 # composer/evolution-composer.c:382
-#: 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:2
@@ -17836,8 +18046,8 @@ msgstr "主题不含有"
 # mail/mail-display.c:106
 # calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
 # mail/mail-display.c:105
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c: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?"
@@ -18048,7 +18258,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
@@ -18118,19 +18329,19 @@ msgstr "则"
 msgid "Add action"
 msgstr "添加动作"
 
+# addressbook/printing/e-contact-print.glade.h:38
+# addressbook/printing/e-contact-print.glade.h:38
+# mail/mail-config.glade.h:92
 #: filter/filter-folder.c:149
-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 "指定文件名："
 
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: 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 "选择文件夹"
 
@@ -18143,7 +18354,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 "重要"
@@ -18342,143 +18553,66 @@ 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
-msgid "is after"
-msgstr "以后"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "以前"
-
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-#: 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 "不是"
-
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "已标志"
-
 # ui/evolution-mail-message.xml.h:98
 # ui/evolution-mail-message.xml.h:98
 # my-evolution/Locations.h:1192
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c: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 "执行 Shell 命令"
@@ -18486,105 +18620,186 @@ msgstr "执行 Shell 命令"
 # calendar/gui/dialogs/alarm-options.glade.h:3
 # calendar/gui/dialogs/alarm-options.glade.h:3
 # calendar/gui/dialogs/alarm-options.glade.h:3
-#: 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 "已回复"
 
-# addressbook/backend/ebook/e-card-simple.c:65
-# addressbook/backend/ebook/e-card-simple.c:70
-# addressbook/backend/ebook/e-card-simple.c:65
-# addressbook/backend/ebook/e-card-simple.c:70
-# my-evolution/Locations.h:327
-#: 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 ""
 
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # mail/message-list.etspec.h:6
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h: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 "执行 Shell 命令"
 
-#: 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 "停止处理"
 
 # mail/message-list.etspec.h:9
 # mail/message-list.etspec.h:10
 # mail/message-list.etspec.h:10
-#: filter/libfilter-i18n.h:60 mail/mail-format.c: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 "存在"
+
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "已标志"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "以后"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "以前"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "大于"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "小于"
+
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: 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 "小于"
+
+# addressbook/backend/ebook/e-card-simple.c:65
+# addressbook/backend/ebook/e-card-simple.c:70
+# addressbook/backend/ebook/e-card-simple.c:65
+# addressbook/backend/ebook/e-card-simple.c:70
+# my-evolution/Locations.h:327
+#: 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 "规则"
@@ -18627,7 +18842,7 @@ msgstr "Evolution 正在导入您原来的电子邮件"
 # importers/pine-importer.c:101
 # importers/elm-importer.c:96 importers/netscape-importer.c:107
 # importers/pine-importer.c:101
-#: 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 "正在导入..."
@@ -18638,7 +18853,7 @@ msgstr "正在导入..."
 # importers/pine-importer.c:103
 # importers/elm-importer.c:98 importers/netscape-importer.c:109
 # importers/pine-importer.c:103
-#: 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 "请等待"
@@ -18649,7 +18864,7 @@ msgstr "请等待"
 # importers/pine-importer.c:365
 # importers/elm-importer.c:169 importers/netscape-importer.c:689
 # importers/pine-importer.c:365
-#: 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"
@@ -18661,7 +18876,7 @@ msgstr "正在按 %2$s 导入 %1$s"
 # importers/pine-importer.c:471
 # importers/elm-importer.c:375 importers/netscape-importer.c:782
 # importers/pine-importer.c:471
-#: 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"
@@ -18673,9 +18888,9 @@ msgstr "正在扫描 %s"
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
-#: importers/elm-importer.c:525 importers/netscape-importer.c: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 "邮件"
 
@@ -18751,7 +18966,7 @@ msgstr ""
 # importers/netscape-importer.c:106
 # importers/netscape-importer.c:106
 # importers/netscape-importer.c:106
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在导入您原来的 Netscape 数据"
 
@@ -18759,7 +18974,7 @@ msgstr "Evolution 正在导入您原来的 Netscape 数据"
 # mail/mail-ops.c:1060 shell/e-local-storage.c:178
 # mail/mail-ops.c:1103 shell/e-local-storage.c:178
 #. Fill in the new fields
-#: importers/netscape-importer.c: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 "已删除"
@@ -18767,7 +18982,7 @@ msgstr "已删除"
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "本地邮件文件 %s"
@@ -18775,25 +18990,25 @@ msgstr "本地邮件文件 %s"
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
-#: 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:897
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "开始导入"
 
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
-#: 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 "编辑过滤规则"
@@ -18801,7 +19016,7 @@ msgstr "编辑过滤规则"
 # importers/netscape-importer.c:984
 # importers/netscape-importer.c:984
 # importers/netscape-importer.c:984
-#: 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?"
@@ -18978,45 +19193,61 @@ msgstr "邮件配置界面"
 msgid "Folder containing mail"
 msgstr "文件夹含有邮件"
 
+# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "公开"
+
+# mail/component-factory.c:100
+# mail/component-factory.c:100
+# mail/component-factory.c:100
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "文件夹含有邮件"
+
 # mail/component-factory.c:102
 # mail/component-factory.c:102
 # mail/component-factory.c:102
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "虚拟已删除邮件箱"
 
 # mail/component-factory.c:102
 # mail/component-factory.c:102
 # mail/component-factory.c:102
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "虚拟已删除邮件文件夹"
 
 # mail/component-factory.c:147
 # mail/component-factory.c:147
 # mail/component-factory.c:147
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "该文件夹不能含有邮件。"
 
 # mail/component-factory.c:432
 # mail/component-factory.c:432
 # mail/component-factory.c:432
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "属性..."
 
 # mail/component-factory.c:432
 # mail/component-factory.c:432
 # mail/component-factory.c:432
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "改变该文件夹的属性"
 
 # mail/component-factory.c:783
 # mail/component-factory.c:783
 # mail/component-factory.c:786
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -19025,18 +19256,18 @@ msgstr "您的某些邮件设置好像已崩溃，请按顺序检查所有内容
 # mail/mail-callbacks.c:230
 # mail/mail-callbacks.c:230
 # mail/mail-callbacks.c:187
-#: 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 ""
 
 # composer/e-msg-composer.c:1412
 # composer/e-msg-composer.c:1329
 # composer/e-msg-composer.c:1295
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "警告： 已改动的邮件"
@@ -19044,21 +19275,21 @@ msgstr "警告： 已改动的邮件"
 # mail/component-factory.c:951
 # mail/component-factory.c:951
 # mail/component-factory.c:955
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "新建邮件"
 
 # ui/evolution-mail-global.xml.h:20
 # ui/evolution-mail-global.xml.h:20
 # ui/evolution-mail-global.xml.h:20
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "邮件(_M)"
 
 # composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
 # composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
 # composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "撰写邮件"
@@ -19066,7 +19297,7 @@ msgstr "撰写邮件"
 # ui/evolution-mail-global.xml.h:10
 # ui/evolution-mail-global.xml.h:10
 # ui/evolution-mail-global.xml.h:10
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "新建邮件"
@@ -19074,7 +19305,7 @@ msgstr "新建邮件"
 # ui/evolution-mail-message.xml.h:65
 # ui/evolution-mail-message.xml.h:65
 # ui/evolution-mail-message.xml.h:65
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "上一个邮件"
@@ -19082,7 +19313,7 @@ msgstr "上一个邮件"
 # mail/component-factory.c:951
 # mail/component-factory.c:951
 # mail/component-factory.c:955
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "新建邮件"
@@ -19090,28 +19321,29 @@ msgstr "新建邮件"
 # mail/component-factory.c:975
 # mail/component-factory.c:975
 # mail/component-factory.c:980
-#: 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:984
 # mail/component-factory.c:984
 # mail/component-factory.c:989
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "无法初始化 Evolution 的邮件配置组件。"
 
 # mail/component-factory.c:990
 # mail/component-factory.c:990
 # mail/component-factory.c:995
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "无法初始化 Evolution 的文件夹信息组件。"
 
 # mail/mail-config.c:2184 mail/mail-config.c:2188
 # mail/mail-config.c:2233 mail/mail-config.c:2237
 # mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "正在连接服务器..."
@@ -19119,14 +19351,14 @@ msgstr "正在连接服务器..."
 # mail/component-factory.c:1206
 # mail/component-factory.c:1206
 # mail/component-factory.c:1211
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "无法用 shell 注册存储"
 
 # mail/folder-browser-ui.c:272
 # mail/folder-browser-ui.c:272
 # mail/folder-browser-ui.c:273
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "“%s”的属性"
@@ -19134,14 +19366,14 @@ msgstr "“%s”的属性"
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:275
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "属性"
 
 # mail/folder-browser.c:297 mail/mail-display.c:298
 # mail/folder-browser.c:297 mail/mail-display.c:297
 # mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/folder-browser.c:309 mail/mail-display.c: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"
@@ -19214,7 +19446,7 @@ msgstr "共 %d 个"
 # ui/evolution-mail-message.xml.h:8
 # ui/evolution-mail-message.xml.h:8
 # ui/evolution-mail-message.xml.h:8
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "从邮件创建虚拟文件夹(_V)"
@@ -19222,102 +19454,102 @@ msgstr "从邮件创建虚拟文件夹(_V)"
 # mail/folder-browser.c:1430
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1438
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "关于主题的虚拟文件夹(_S)"
 
 # mail/folder-browser.c:1431
 # mail/folder-browser.c:1438
 # mail/folder-browser.c:1439
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "关于发件人的虚拟文件夹(_N)"
 
 # mail/folder-browser.c:1432
 # mail/folder-browser.c:1439
 # mail/folder-browser.c:1440
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "关于收件人的虚拟文件夹(_R)"
 
 # mail/folder-browser.c:1433
 # mail/folder-browser.c:1440
 # mail/folder-browser.c:1441
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "关于邮件列表的虚拟文件夹(_L)"
 
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1444
 # mail/folder-browser.c:1445
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "过滤标题(_J)"
 
 # mail/folder-browser.c:1438
 # mail/folder-browser.c:1445
 # mail/folder-browser.c:1446
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "过滤发件人(_D)"
 
 # mail/folder-browser.c:1439
 # mail/folder-browser.c:1446
 # mail/folder-browser.c:1447
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "过滤收件人(_C)"
 
 # mail/folder-browser.c:1440
 # mail/folder-browser.c:1447
 # mail/folder-browser.c:1448
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "过滤邮件列表(_M)"
 
 # mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
 # mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:96
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:98
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "作为新邮件进行编辑(_E)..."
 
 # mail/folder-browser.c:1450
 # mail/folder-browser.c:1457
 # mail/folder-browser.c:1458
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "打印(_P)"
 
 # mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
 # mail/folder-browser.c:1461 ui/evolution-mail-message.xml.h:104
 # mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
-#: mail/folder-browser.c: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)"
 
 # mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
 # mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:73
 # mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
-#: mail/folder-browser.c: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 "回复邮件列表(_L)"
 
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
 # mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:72
 # mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
-#: mail/folder-browser.c: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 "回复所有人(_A)"
 
 # mail/folder-browser.c:1457
 # mail/folder-browser.c:1464
 # mail/folder-browser.c:1465
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
@@ -19333,7 +19565,7 @@ msgstr ""
 # calendar/gui/dialogs/task-details-page.glade.h:4
 # calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
 # calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "已完成"
@@ -19342,7 +19574,7 @@ msgstr "已完成"
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # widgets/misc/e-filter-bar.h:95
 # widgets/misc/e-filter-bar.h:95
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "清除"
@@ -19351,14 +19583,14 @@ msgstr "清除"
 # mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:43
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
 #. separator here?
-#: mail/folder-browser.c: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 "标记为已读(_K)"
 
 # mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "标记为未读(_N)"
@@ -19366,14 +19598,14 @@ msgstr "标记为未读(_N)"
 # mail/folder-browser.c:1461
 # mail/folder-browser.c:1468
 # mail/folder-browser.c:1469
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
 # ui/evolution-mail-message.xml.h:46
 # ui/evolution-mail-message.xml.h:46
 # ui/evolution-mail-message.xml.h:46
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "标记为不重要(_O)"
@@ -19381,7 +19613,7 @@ msgstr "标记为不重要(_O)"
 # mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
 # mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
 # mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "反删除(_U)"
@@ -19389,7 +19621,7 @@ msgstr "反删除(_U)"
 # mail/folder-browser.c:1466
 # mail/folder-browser.c:1475
 # mail/folder-browser.c:1476
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "移动到文件夹(_M)..."
@@ -19397,14 +19629,14 @@ msgstr "移动到文件夹(_M)..."
 # mail/folder-browser.c:1467
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1477
-#: 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:1473 ui/evolution-mail-message.xml.h:1
 # mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
 # mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "将发件人添加到地址簿"
@@ -19412,7 +19644,7 @@ msgstr "将发件人添加到地址簿"
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1485
 # mail/folder-browser.c:1486
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "应用过滤规则"
@@ -19420,7 +19652,7 @@ msgstr "应用过滤规则"
 # mail/folder-browser.c:1478
 # mail/folder-browser.c:1487
 # mail/folder-browser.c:1488
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "从消息创建规则(_L)"
@@ -19428,7 +19660,7 @@ msgstr "从消息创建规则(_L)"
 # mail/folder-browser.c:1629
 # mail/folder-browser.c:1657
 # mail/folder-browser.c:1658
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "关于邮件列表的虚拟文件夹"
@@ -19436,7 +19668,7 @@ msgstr "关于邮件列表的虚拟文件夹"
 # mail/folder-browser.c:1631
 # mail/folder-browser.c:1659
 # mail/folder-browser.c:1660
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "过滤邮件列表 (%s)"
@@ -19444,7 +19676,7 @@ msgstr "过滤邮件列表 (%s)"
 # mail/folder-browser.c:1632
 # mail/folder-browser.c:1660
 # mail/folder-browser.c:1661
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "关于邮件列表 (%s) 的虚拟文件夹"
@@ -19565,14 +19797,14 @@ msgstr "Evolution 帐号编辑器"
 # mail/mail-config.glade.h:104
 # mail/mail-config.glade.h:104
 # mail/mail-config.glade.h:113
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "主机(_H)："
 
 # mail/mail-config.glade.h:117
 # mail/mail-config.glade.h:117
 # mail/mail-config.glade.h:126
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "User_name:"
 msgstr "用户名(_U)："
@@ -19580,14 +19812,14 @@ msgstr "用户名(_U)："
 # mail/mail-config.glade.h:112
 # mail/mail-config.glade.h:112
 # mail/mail-config.glade.h:121
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "路径(_P)："
 
 # mail/mail-account-gui.c:1654
 # mail/mail-account-gui.c:1654
 # mail/mail-account-gui.c:1665
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "您不能以相同的名字创建两个帐号。"
 
@@ -19616,8 +19848,8 @@ msgstr "确实删除帐号？"
 # mail/mail-accounts.c:194
 # mail/mail-accounts.c:194
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c: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 "禁用"
 
@@ -19625,8 +19857,8 @@ msgstr "禁用"
 # mail/mail-accounts.c:196
 # mail/mail-accounts.c:196
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c: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 "启用"
 
@@ -19748,9 +19980,10 @@ msgstr ""
 # mail/mail-callbacks.c:222
 #. 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"
 
 # mail/mail-callbacks.c:280
@@ -19811,7 +20044,7 @@ msgstr "您必须指定收件人以便发送该消息。"
 # composer/e-msg-composer.c:1068
 # mail/mail-callbacks.c:716
 # mail/mail-callbacks.c:668
-#: 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?"
@@ -19822,35 +20055,35 @@ msgstr ""
 # mail/mail-callbacks.c:838
 # mail/mail-callbacks.c:928
 # mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "未知的发件人"
 
 # mail/mail-callbacks.c:843
 # mail/mail-callbacks.c:933
 # mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "在 %Y-%m-%d %a 的 %H:%M， %%s 写道："
 
 # mail/mail-callbacks.c:1281 mail/message-browser.c:130
 # mail/mail-callbacks.c:1376 mail/message-browser.c:130
 # mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: mail/mail-callbacks.c: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:1283 mail/message-browser.c:132
 # mail/mail-callbacks.c:1378 mail/message-browser.c:132
 # mail/mail-callbacks.c:1413 mail/message-browser.c:132
-#: mail/mail-callbacks.c: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:1759
 # mail/mail-callbacks.c:1878
 # mail/mail-callbacks.c:1914
-#: 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 个消息？"
@@ -19858,7 +20091,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息？"
 # mail/mail-callbacks.c:1784
 # mail/mail-callbacks.c:1903
 # mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -19869,7 +20102,7 @@ msgstr ""
 # mail/mail-callbacks.c:1823
 # mail/mail-callbacks.c:1942
 # mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -19880,7 +20113,7 @@ msgstr ""
 # mail/mail-callbacks.c:1837
 # mail/mail-callbacks.c:1956
 # mail/mail-callbacks.c:1992
-#: 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 个消息？"
@@ -19888,7 +20121,7 @@ msgstr "您确信您希望重新发送所有的 %d 个消息？"
 # mail/mail-callbacks.c:1863
 # mail/mail-callbacks.c:1982
 # mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "没有选择消息"
 
@@ -19898,33 +20131,33 @@ msgstr "没有选择消息"
 # mail/mail-display.c:102
 # calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
 # mail/mail-display.c:101
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "覆盖文件？"
 
 # mail/mail-callbacks.c:1962
 # mail/mail-callbacks.c:2081
 # mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "消息另存为..."
 
 # mail/mail-callbacks.c:1964
 # mail/mail-callbacks.c:2083
 # mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "消息另存为..."
 
 # ui/evolution-mail-message.xml.h:21
 # ui/evolution-mail-message.xml.h:21
 # ui/evolution-mail-message.xml.h:21
-#: mail/mail-callbacks.c: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?"
@@ -19933,7 +20166,7 @@ msgstr ""
 # mail/mail-callbacks.c:2135
 # mail/mail-callbacks.c:2254
 # mail/mail-callbacks.c:2290
-#: 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"
@@ -19948,7 +20181,7 @@ msgstr ""
 # mail/mail-callbacks.c:2250
 # mail/mail-callbacks.c:2369
 # mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -19960,14 +20193,14 @@ msgstr ""
 # mail/mail-callbacks.c:2262
 # mail/mail-callbacks.c:2381
 # mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "过滤规则"
 
 # camel/camel-filter-driver.c:789
 # camel/camel-filter-driver.c:838
 # mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
@@ -19975,32 +20208,32 @@ msgstr "第 %d 页，共 %d 页"
 # mail/mail-callbacks.c:2325
 # mail/mail-callbacks.c:2465
 # mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "打印消息"
 
 # mail/mail-callbacks.c:2492
 # mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "美国信纸"
 
 # mail/mail-callbacks.c:2371
 # mail/mail-callbacks.c:2531
 # mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "打印消息失败"
 
 # mail/mail-callbacks.c:2473
 # mail/mail-callbacks.c:2697
 # mail/mail-callbacks.c:2770
-#: mail/mail-callbacks.c: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."
@@ -20009,20 +20242,20 @@ msgstr ""
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # my-evolution/e-summary-calendar.c:395
-#: mail/mail-composer-prefs.c: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 ""
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:506
 # addressbook/gui/component/select-names/e-select-names-popup.c:506
 # addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 #, fuzzy
 msgid "Unnamed"
 msgstr "未命名的联系人"
@@ -20030,12 +20263,12 @@ msgstr "未命名的联系人"
 # ui/evolution-message-composer.xml.h:27
 # ui/evolution-message-composer.xml.h:27
 # ui/evolution-message-composer.xml.h:27
-#: 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 "添加条件"
@@ -20043,7 +20276,7 @@ msgstr "添加条件"
 # mail/mail-account-gui.c:1039
 # mail/mail-account-gui.c:1039
 # mail/mail-account-gui.c:1036
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "保存签名"
@@ -20120,7 +20353,7 @@ msgstr "Evolution 帐号助手"
 # mail/mail-config.c:326
 # mail/mail-config.c:329
 # mail/mail-config.c:354
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr "帐号 %d"
@@ -20128,14 +20361,14 @@ msgstr "帐号 %d"
 # mail/mail-config.c:2113
 # mail/mail-config.c:2155
 # mail/mail-config.c:2248
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "正在检查服务"
 
 # mail/mail-config.c:2184 mail/mail-config.c:2188
 # mail/mail-config.c:2233 mail/mail-config.c:2237
 # mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "正在连接服务器..."
 
@@ -21243,14 +21476,14 @@ msgstr "无法创建 S/MIME 解码上下文。"
 # mail/mail-display.c:243
 # mail/mail-display.c:242
 # mail/mail-display.c:243
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "保存附件"
 
 # mail/folder-browser.c:297 mail/mail-display.c:298
 # mail/folder-browser.c:297 mail/mail-display.c:297
 # mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "无法创建临时目录： %s"
@@ -21258,7 +21491,7 @@ msgstr "无法创建临时目录： %s"
 # mail/mail-display.c:243
 # mail/mail-display.c:242
 # mail/mail-display.c:243
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "保存附件"
@@ -21266,14 +21499,14 @@ msgstr "保存附件"
 # mail/mail-display.c:352
 # mail/mail-display.c:351
 # mail/mail-display.c:352
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "嵌入视图"
 
 # mail/mail-display.c:354
 # mail/mail-display.c:353
 # mail/mail-display.c:354
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
@@ -21281,7 +21514,7 @@ msgstr "在 %s 中打开..."
 # mail/mail-display.c:415
 # mail/mail-display.c:414
 # mail/mail-display.c:415
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "嵌入视图 (通过 %s)"
@@ -21289,21 +21522,21 @@ msgstr "嵌入视图 (通过 %s)"
 # mail/mail-display.c:419
 # mail/mail-display.c:418
 # mail/mail-display.c:419
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "隐藏"
 
 # mail/mail-display.c:440
 # mail/mail-display.c:439
 # mail/mail-display.c:440
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "外部视图"
 
 # ui/evolution-mail-message.xml.h:42
 # ui/evolution-mail-message.xml.h:42
 # ui/evolution-mail-message.xml.h:42
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "装入图像(_I)"
@@ -21311,52 +21544,48 @@ msgstr "装入图像(_I)"
 # mail/mail-display.c:1133
 # mail/mail-display.c:1136
 # mail/mail-display.c:1162
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "装入邮件内容"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "被延误的任务(_V)："
 
-#: 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:1602
 # mail/mail-display.c:1628
 # mail/mail-display.c:1657
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "在浏览器中打开连接"
 
 # mail/mail-display.c:1604
 # mail/mail-display.c:1630
 # mail/mail-display.c:1659
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "复制连接位置"
 
 # mail/mail-display.c:1607
 # mail/mail-display.c:1633
 # mail/mail-display.c:1662
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "连接保存为 (FIXME)"
 
 # mail/mail-display.c:1610
 # mail/mail-display.c:1636
 # mail/mail-display.c:1665
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "图像保存为..."
 
@@ -21374,7 +21603,7 @@ msgstr "正在扫描 %s"
 # mail/mail-format.c:635
 # mail/mail-format.c:640
 # mail/mail-format.c:646
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
@@ -21382,56 +21611,57 @@ msgstr "%s 附件"
 # mail/mail-format.c:680
 # mail/mail-format.c:686
 # mail/mail-format.c:692
-#: 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:763
 # mail/mail-format.c:769
 # mail/mail-format.c:775
-#: 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:846
 # mail/mail-format.c:861
 # mail/mail-format.c:867
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "无效地址"
 
 # mail/mail-format.c:886 mail/message-list.etspec.h:3
 # mail/mail-format.c:904 mail/message-list.etspec.h:3
 # mail/mail-format.c:910 mail/message-list.etspec.h:3
-#: mail/mail-format.c: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:889
 # mail/mail-format.c:908
 # mail/mail-format.c:914
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "回复至"
 
 # mail/mail-format.c:893 mail/message-list.etspec.h:10
 # mail/mail-format.c:913 mail/message-list.etspec.h:11
 # mail/mail-format.c:919 mail/message-list.etspec.h:11
-#: mail/mail-format.c: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:897
 # mail/mail-format.c:918
 # mail/mail-format.c:924
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "抄送"
 
 # mail/mail-format.c:901
 # mail/mail-format.c:923
 # mail/mail-format.c:929
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "密件抄送"
 
@@ -21441,7 +21671,7 @@ msgstr "密件抄送"
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr "邮件"
@@ -21449,7 +21679,7 @@ msgstr "邮件"
 # mail/mail-format.c:1813
 # mail/mail-format.c:1749
 # mail/mail-format.c:1768
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
@@ -21457,7 +21687,7 @@ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
 # mail/mail-crypto.c:84
 # mail/mail-crypto.c:84
 # mail/mail-crypto.c:84
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "无法创建 PGP 验证上下文。"
@@ -21465,21 +21695,21 @@ msgstr "无法创建 PGP 验证上下文。"
 # mail/mail-format.c:1844
 # mail/mail-format.c:1780
 # mail/mail-format.c:1799
-#: 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:1852
 # mail/mail-format.c:1788
 # mail/mail-format.c:1807
-#: 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:2068
 # mail/mail-format.c:2003
 # mail/mail-format.c:2022
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
@@ -21487,7 +21717,7 @@ msgstr "指向 FTP 站点 (%s)"
 # mail/mail-format.c:2082
 # mail/mail-format.c:2017
 # mail/mail-format.c:2036
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -21495,7 +21725,7 @@ msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 # mail/mail-format.c:2087
 # mail/mail-format.c:2022
 # mail/mail-format.c:2041
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
@@ -21503,7 +21733,7 @@ msgstr "指向本地文件 (%s)"
 # mail/mail-format.c:2116
 # mail/mail-format.c:2051
 # mail/mail-format.c:2070
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
@@ -21511,7 +21741,7 @@ msgstr "指向远程数据 (%s)"
 # mail/mail-format.c:2124
 # mail/mail-format.c:2059
 # mail/mail-format.c:2078
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
@@ -21519,14 +21749,14 @@ msgstr "指向未知的外部数据 (“%s”类型)"
 # mail/mail-format.c:2129
 # mail/mail-format.c:2064
 # mail/mail-format.c:2083
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "本地文件夹"
@@ -21534,14 +21764,14 @@ msgstr "本地文件夹"
 # mail/mail-local.c:626
 # mail/mail-local.c:626
 # mail/mail-local.c:626
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "正在重新配置文件夹"
 
 # mail/mail-local.c:707
 # mail/mail-local.c:707
 # mail/mail-local.c:707
-#: 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"
@@ -21553,7 +21783,7 @@ msgstr ""
 # mail/mail-local.c:763
 # mail/mail-local.c:763
 # mail/mail-local.c:763
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "无法把文件夹元信息保存到 %s： %s"
@@ -21561,7 +21791,7 @@ msgstr "无法把文件夹元信息保存到 %s： %s"
 # mail/mail-local.c:815
 # mail/mail-local.c:815
 # mail/mail-local.c:815
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "无法删除文件夹元信息 %s： %s"
@@ -21569,23 +21799,15 @@ msgstr "无法删除文件夹元信息 %s： %s"
 # mail/mail-local.c:1281
 # mail/mail-local.c:1281
 # mail/mail-local.c:1281
-#: 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:1296
-# mail/mail-local.c:1296
-# mail/mail-local.c:1296
-#: 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:1318
 # mail/mail-local.c:1318
 # mail/mail-local.c:1318
-#: 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."
@@ -21593,21 +21815,21 @@ msgstr ""
 "如果您无法打开该邮件箱，\n"
 "那么您可能必需手工修复它。"
 
-# mail/mail-local.c:1407
-# mail/mail-local.c:1407
-# mail/mail-local.c:1407
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "您不能改变远程文件夹的格式。"
-
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "重新配置 /%s"
 
+# mail/mail-local.c:1407
+# mail/mail-local.c:1407
+# mail/mail-local.c:1407
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "您不能改变远程文件夹的格式。"
+
 # mail/mail-mt.c:254
 # mail/mail-mt.c:254
 # mail/mail-mt.c:254
@@ -21998,14 +22220,14 @@ msgstr "用户己取消操作。"
 # mail/mail-config.glade.h:113
 # mail/mail-config.glade.h:113
 # mail/mail-config.glade.h:122
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "记住该密码(_R)"
 
 # e-util/e-passwords.c:362 mail/mail-session.c:268
 # e-util/e-passwords.c:362 mail/mail-session.c:268
 # e-util/e-passwords.c:362 mail/mail-session.c:270
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "在本会话中记住该密码"
@@ -22013,7 +22235,7 @@ msgstr "在本会话中记住该密码"
 # mail/mail-session.c:319
 # mail/mail-session.c:319
 # mail/mail-session.c:321
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s 输入密码"
@@ -22021,7 +22243,7 @@ msgstr "为 %s 输入密码"
 # mail/mail-session.c:322
 # mail/mail-session.c:322
 # mail/mail-session.c:324
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "输入密码"
 
@@ -22036,14 +22258,14 @@ msgstr "无法保存签名文件。"
 # mail/mail-account-gui.c:1039
 # mail/mail-account-gui.c:1039
 # mail/mail-account-gui.c:1036
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "保存签名"
 
 # mail/mail-account-gui.c:1045
 # mail/mail-account-gui.c:1045
 # mail/mail-account-gui.c:1042
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -22053,14 +22275,14 @@ msgstr ""
 "\n"
 "您希望保存改动吗？"
 
-#: 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 ""
 
 # my-evolution/e-summary-preferences.c:956
 # my-evolution/e-summary-preferences.c:956
 # my-evolution/e-summary-preferences.c:958
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "名称："
 
@@ -22117,7 +22339,7 @@ msgstr ""
 # mail/mail-vfolder.c:728
 # mail/mail-vfolder.c:728
 # mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "虚拟文件夹"
 
@@ -22168,109 +22390,109 @@ msgstr "%s - 邮件"
 # mail/message-list.c:639
 # mail/message-list.c:645
 # mail/message-list.c:662
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "不可见"
 
 # mail/message-list.c:640
 # mail/message-list.c:646
 # mail/message-list.c:663
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "可见"
 
 # mail/message-list.c:641
 # mail/message-list.c:647
 # mail/message-list.c:664
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "已应答"
 
 # mail/message-list.c:642
 # mail/message-list.c:648
 # mail/message-list.c:665
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "多个不可见邮件"
 
 # mail/message-list.c:643
 # mail/message-list.c:649
 # mail/message-list.c:666
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "多个邮件"
 
 # mail/message-list.c:647
 # mail/message-list.c:658
 # mail/message-list.c:675
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:648
 # mail/message-list.c:659
 # mail/message-list.c:676
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "较低"
 
 # mail/message-list.c:652
 # mail/message-list.c:663
 # mail/message-list.c:680
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "较高"
 
 # mail/message-list.c:653
 # mail/message-list.c:664
 # mail/message-list.c:681
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:903
 # mail/message-list.c:920
 # mail/message-list.c:937
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
 # mail/message-list.c:910
 # mail/message-list.c:927
 # mail/message-list.c:944
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:919
 # mail/message-list.c:936
 # mail/message-list.c:953
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:931
 # mail/message-list.c:948
 # mail/message-list.c:965
-#: mail/message-list.c: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:941
 # mail/message-list.c:958
 # mail/message-list.c:975
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
 # mail/message-list.c:2334
 # mail/message-list.c:2358
 # mail/message-list.c:2387
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "正在生成邮件列表"
 
@@ -22395,14 +22617,62 @@ 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 ""
 
+# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+# calendar/gui/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:329
+# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+# calendar/gui/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:329
+# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+# calendar/gui/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
+# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+#: mail/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 ""
+
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:95
+#: mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Clear Flag"
+msgstr "清除"
+
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "预定 "
+
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "已标志"
+
 # mail/subscribe-dialog.c:219
 # mail/subscribe-dialog.c:219
 # mail/subscribe-dialog.c:219
-#: mail/subscribe-dialog.c:228
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
@@ -22410,7 +22680,7 @@ msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
 # mail/subscribe-dialog.c:221
 # mail/subscribe-dialog.c:221
 # mail/subscribe-dialog.c:221
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "正在扫描“%s”上的根级文件夹"
@@ -22418,7 +22688,7 @@ msgstr "正在扫描“%s”上的根级文件夹"
 # mail/subscribe-dialog.c:318
 # mail/subscribe-dialog.c:318
 # mail/subscribe-dialog.c:318
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "订阅到文件夹 “%s”"
@@ -22426,7 +22696,7 @@ msgstr "订阅到文件夹 “%s”"
 # mail/subscribe-dialog.c:320
 # mail/subscribe-dialog.c:320
 # mail/subscribe-dialog.c:320
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "取消到文件夹“%s”的订阅"
@@ -22437,7 +22707,7 @@ msgstr "取消到文件夹“%s”的订阅"
 # shell/e-storage-set-view.etspec.h:1
 # mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 # shell/e-storage-set-view.etspec.h:1
-#: mail/subscribe-dialog.c: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 "文件夹"
@@ -22445,7 +22715,7 @@ msgstr "文件夹"
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-message-composer.xml.h:23
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "保存到文件夹..."
@@ -22453,14 +22723,14 @@ msgstr "保存到文件夹..."
 # mail/subscribe-dialog.c:1520
 # mail/subscribe-dialog.c:1520
 # mail/subscribe-dialog.c:1520
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "没有选定服务器"
 
 # mail/subscribe-dialog.c:1581
 # mail/subscribe-dialog.c:1581
 # mail/subscribe-dialog.c:1581
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "请选择服务器。"
 
@@ -37990,15 +38260,15 @@ msgstr "无描述"
 # my-evolution/e-summary-mail.c:129
 # my-evolution/e-summary-mail.c:129
 # my-evolution/e-summary-mail.c:129
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "邮件概要"
 
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
-#: my-evolution/e-summary-mail.c: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 "本地文件夹"
 
@@ -38014,35 +38284,35 @@ 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:444
 # my-evolution/e-summary-preferences.c:444
 # my-evolution/e-summary-preferences.c:445
-#: 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:465
 # my-evolution/e-summary-preferences.c:465
 # my-evolution/e-summary-preferences.c:466
-#: 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:944
 # my-evolution/e-summary-preferences.c:944
 # my-evolution/e-summary-preferences.c:946
-#: 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:952
 # my-evolution/e-summary-preferences.c:952
 # my-evolution/e-summary-preferences.c:954
-#: 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"
 
@@ -38106,14 +38376,14 @@ 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:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:504
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "天气"
 
@@ -40400,6 +40670,14 @@ msgstr ""
 "无法转移文件夹：\n"
 "%s"
 
+# mail/mail-display.c:354
+# mail/mail-display.c:353
+# mail/mail-display.c:354
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "在 %s 中打开..."
+
 # mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 # shell/e-storage-set-view.etspec.h:1
 # mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
@@ -40766,15 +41044,31 @@ msgstr "重命名文件夹"
 # shell/e-shell-folder-commands.c:554
 # shell/e-shell-folder-creation-dialog.c:168
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c: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-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"无法重命名文件夹：\n"
+"%s"
+
 # shell/e-shell-folder-creation-dialog.c:111
 # shell/e-shell-folder-creation-dialog.c:111
 # shell/e-shell-folder-creation-dialog.c:125
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -40786,7 +41080,7 @@ msgstr ""
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "创建新文件夹(_N)..."
@@ -40794,7 +41088,7 @@ msgstr "创建新文件夹(_N)..."
 # shell/e-shell-folder-selection-dialog.c:376
 # shell/e-shell-folder-selection-dialog.c:376
 # shell/e-shell-folder-selection-dialog.c:376
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "正在新建..."
 
@@ -40834,26 +41128,10 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信息："
 
-# shell/e-shell-importer.c:243
-# shell/e-shell-importer.c:243
-# shell/e-shell-importer.c:243
-#. 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:263 shell/e-shell-importer.c:294
 # shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -40865,7 +41143,7 @@ msgstr ""
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "选择文件夹"
@@ -40873,7 +41151,7 @@ msgstr "选择文件夹"
 # shell/e-shell-importer.c:397
 # shell/e-shell-importer.c:397
 # shell/e-shell-importer.c:409
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "文件 %s 不存在"
@@ -40882,15 +41160,15 @@ msgstr "文件 %s 不存在"
 # shell/e-shell-about-box.c:40
 # shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
 # shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
-#: shell/e-shell-importer.c: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:424
 # shell/e-shell-importer.c:424
 # shell/e-shell-importer.c:435
-#: 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"
@@ -40902,14 +41180,14 @@ msgstr ""
 # shell/e-shell-importer.c:434
 # shell/e-shell-importer.c:434
 # shell/e-shell-importer.c:445
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "正在导入"
 
 # shell/e-shell-importer.c:442
 # shell/e-shell-importer.c:442
 # shell/e-shell-importer.c:453
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -40921,7 +41199,7 @@ msgstr ""
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:466
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "启动 %s 错误"
@@ -40929,7 +41207,7 @@ msgstr "启动 %s 错误"
 # shell/e-shell-importer.c:474
 # shell/e-shell-importer.c:474
 # shell/e-shell-importer.c:485
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "装入 %s 错误"
@@ -40937,7 +41215,7 @@ msgstr "装入 %s 错误"
 # shell/e-shell-importer.c:491
 # shell/e-shell-importer.c:491
 # shell/e-shell-importer.c:502
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -40949,49 +41227,49 @@ msgstr ""
 # shell/e-shell-importer.c:561
 # shell/e-shell-importer.c:561
 # shell/e-shell-importer.c:572
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "自动"
 
 # shell/e-shell-importer.c:612
 # shell/e-shell-importer.c:612
 # shell/e-shell-importer.c:623
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "文件名："
 
 # shell/e-shell-importer.c:617
 # shell/e-shell-importer.c:617
 # shell/e-shell-importer.c:628
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "选择一个文件"
 
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:638
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "文件类型："
 
 # shell/e-shell-importer.c:652
 # shell/e-shell-importer.c:652
 # shell/e-shell-importer.c:663
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "从老版程序中导入数据和设置"
 
 # shell/e-shell-importer.c:656
 # shell/e-shell-importer.c:656
 # shell/e-shell-importer.c:667
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "导入单个文件"
 
 # shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
 # shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
 # shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
-#: shell/e-shell-importer.c: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"
@@ -41002,14 +41280,14 @@ msgstr ""
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/e-shell-importer.c: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:848 shell/e-shell-startup-wizard.c:754
 # shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
 # shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
-#: shell/e-shell-importer.c: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："
@@ -41017,21 +41295,21 @@ msgstr "从 %s："
 # shell/e-shell-importer.c:1014
 # shell/e-shell-importer.c:1014
 # shell/e-shell-importer.c:1027
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "选择文件夹"
 
 # shell/e-shell-importer.c:1015
 # shell/e-shell-importer.c:1015
 # shell/e-shell-importer.c:1028
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "为导入的数据选择目标文件夹"
 
 # shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
 # shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
 # shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "导入"
 
@@ -41071,7 +41349,7 @@ msgstr ""
 # shell/e-shell-about-box.c:40
 # shell/e-shell-about-box.c:40
 # shell/e-shell-about-box.c:40
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution "
@@ -41079,7 +41357,7 @@ msgstr "Evolution "
 # mail/mail-ops.c:1234
 # mail/mail-ops.c:1236
 # mail/mail-ops.c:1279
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "正在打开文件夹 %s"
@@ -41087,7 +41365,7 @@ msgstr "正在打开文件夹 %s"
 # mail/mail-ops.c:1234
 # mail/mail-ops.c:1236
 # mail/mail-ops.c:1279
-#: 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"
@@ -41095,7 +41373,7 @@ msgstr "正在打开文件夹 %s"
 # mail/mail-display.c:354
 # mail/mail-display.c:353
 # mail/mail-display.c:354
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "在 %s 中打开..."
@@ -41103,7 +41381,7 @@ msgstr "在 %s 中打开..."
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "无法重命名文件夹： %s"
@@ -41111,7 +41389,7 @@ msgstr "无法重命名文件夹： %s"
 # shell/e-shell-folder-creation-dialog.c:111
 # shell/e-shell-folder-creation-dialog.c:111
 # shell/e-shell-folder-creation-dialog.c:125
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -41179,42 +41457,42 @@ msgstr "“.”和“..”是保留文件夹名。"
 # shell/e-shell-view-menu.c:165
 # shell/e-shell-view-menu.c:165
 # shell/e-shell-view-menu.c:165
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "在您的 $PATH 中找不到 Bug buddy。"
 
 # shell/e-shell-view-menu.c:173
 # shell/e-shell-view-menu.c:173
 # shell/e-shell-view-menu.c:173
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "无法运行 Bug buddy。"
 
 # shell/e-shell-view-menu.c:215
 # shell/e-shell-view-menu.c:215
 # shell/e-shell-view-menu.c:215
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "关于 Ximian Evolution"
 
 # shell/e-shell-view-menu.c:424
 # shell/e-shell-view-menu.c:424
 # shell/e-shell-view-menu.c:424
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "转到文件夹..."
 
 # shell/e-shell-view-menu.c:425
 # shell/e-shell-view-menu.c:425
 # shell/e-shell-view-menu.c:425
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "选择您希望打开的文件夹"
 
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "创建新快捷方式"
@@ -41222,28 +41500,28 @@ msgstr "创建新快捷方式"
 # shell/e-shell-view-menu.c:546
 # shell/e-shell-view-menu.c:546
 # shell/e-shell-view-menu.c:546
-#: shell/e-shell-view-menu.c: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:688
 # shell/e-shell-view-menu.c:688
 # shell/e-shell-view-menu.c:688
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "离线工作(_W)"
 
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "离线工作"
 
@@ -41257,7 +41535,7 @@ msgstr "(未显示文件夹)"
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1598
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -41265,14 +41543,14 @@ msgstr "%s (%d)"
 # shell/e-shell-view.c:1587
 # shell/e-shell-view.c:1587
 # shell/e-shell-view.c:1600
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(无)"
 
 # shell/e-shell-view.c:1634
 # shell/e-shell-view.c:1634
 # shell/e-shell-view.c:1647
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -41280,14 +41558,14 @@ msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
 # shell/e-shell-view.c:1641
 # shell/e-shell-view.c:1641
 # shell/e-shell-view.c:1654
-#: shell/e-shell-view.c: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:1647
 # shell/e-shell-view.c:1647
 # shell/e-shell-view.c:1660
-#: 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 "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
@@ -41310,7 +41588,7 @@ msgstr ""
 # shell/e-shell.c:651
 # shell/e-shell.c:651
 # shell/e-shell.c:651
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "无法设置本地存储 -- %s"
@@ -41318,7 +41596,7 @@ msgstr "无法设置本地存储 -- %s"
 # shell/e-shell.c:1659
 # shell/e-shell.c:1659
 # shell/e-shell.c:1660
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -41332,28 +41610,28 @@ msgstr ""
 # shell/e-shell.c:1886
 # shell/e-shell.c:1886
 # shell/e-shell.c:1887
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "无效参数"
 
 # shell/e-shell.c:1888
 # shell/e-shell.c:1888
 # shell/e-shell.c:1889
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "无法注册到 OAF"
 
 # shell/e-shell.c:1890
 # shell/e-shell.c:1890
 # shell/e-shell.c:1891
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "找不到配置数据库"
 
 # shell/e-shell.c:1892 shell/e-storage.c:500
 # shell/e-shell.c:1892 shell/e-storage.c:500
 # shell/e-shell.c:1893 shell/e-storage.c:500
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "通用错误"
 
@@ -41594,94 +41872,98 @@ msgstr "主席"
 # shell/e-storage.c:498
 # shell/e-storage.c:498
 # shell/e-storage.c:498
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "无错误"
 
 # shell/e-storage.c:502
 # shell/e-storage.c:502
 # shell/e-storage.c:502
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "已经有一个同名文件夹存在"
 
 # shell/e-storage.c:504
 # shell/e-storage.c:504
 # shell/e-storage.c:504
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "指定的文件夹类型无效"
 
 # shell/e-storage.c:506
 # shell/e-storage.c:506
 # shell/e-storage.c:506
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "输入输出错误"
 
 # shell/e-storage.c:508
 # shell/e-storage.c:508
 # shell/e-storage.c:508
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "没有足够的空间创建文件夹"
 
 # shell/e-storage.c:510
 # shell/e-storage.c:510
 # shell/e-storage.c:510
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "文件夹不为空"
 
 # shell/e-storage.c:512
 # shell/e-storage.c:512
 # shell/e-storage.c:512
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "找不到指定的文件夹"
 
 # shell/e-storage.c:514
 # shell/e-storage.c:514
 # shell/e-storage.c:514
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "在该存储中没有实现该功能"
 
 # shell/e-storage.c:518
 # shell/e-storage.c:518
 # shell/e-storage.c:518
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "不支持的操作"
 
 # shell/e-storage.c:520
 # shell/e-storage.c:520
 # shell/e-storage.c:520
-#: 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:522
 # shell/e-storage.c:522
 # shell/e-storage.c:522
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "无法修改或删除指定的文件夹"
 
 # shell/e-storage.c:524
 # shell/e-storage.c:524
 # shell/e-storage.c:524
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "无法使文件夹成为它的子目录的子目录"
 
 # shell/e-storage.c:526
 # shell/e-storage.c:526
 # shell/e-storage.c:526
-#: shell/e-storage.c: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
 # shell/e-task-widget.c:191
 # shell/e-task-widget.c:191
@@ -42034,9 +42316,10 @@ msgstr ""
 # shell/glade/evolution-startup-wizard.glade.h:15
 # shell/glade/evolution-startup-wizard.glade.h:15
 #: shell/glade/evolution-startup-wizard.glade.h:15
+#, 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 ""
@@ -42059,45 +42342,38 @@ msgstr "点击“导入”以便开始将文件导入到 Evolution。"
 msgid "Evolution Import Assistant"
 msgstr "Evolution 导入助手"
 
-# shell/importer/import.glade.h:3
-# shell/importer/import.glade.h:3
-# shell/importer/import.glade.h:3
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution 导入器助手"
-
 # shell/importer/import.glade.h:4
 # shell/importer/import.glade.h:4
 # shell/importer/import.glade.h:4
-#: shell/importer/import.glade.h:4
+#: shell/importer/import.glade.h:3
 msgid "Import File (step 3 of 3)"
 msgstr "导入文件 (3 之 3 步)"
 
 # shell/importer/import.glade.h:5
 # shell/importer/import.glade.h:5
 # shell/importer/import.glade.h:5
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "导入类型 (3 之 1 步)"
 
 # shell/importer/import.glade.h:6
 # shell/importer/import.glade.h:6
 # shell/importer/import.glade.h:6
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "选择导入器 (3 之 2 步)"
 
 # shell/importer/import.glade.h:7
 # shell/importer/import.glade.h:7
 # shell/importer/import.glade.h:7
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "选择文件 (3 之 2 步)"
 
 # shell/importer/import.glade.h:8
 # shell/importer/import.glade.h:8
 # shell/importer/import.glade.h:8
-#: 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"
@@ -42451,10 +42727,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 "动作(_A)"
 
@@ -42666,7 +42942,7 @@ msgstr "打印该项"
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "保存"
 
@@ -42732,7 +43008,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 "文件(_F)"
 
@@ -42886,7 +43162,8 @@ msgstr "为此项调度会议"
 # ui/evolution-executive-summary.xml.h:1
 # ui/evolution-executive-summary.xml.h:1
 #: 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
@@ -42968,48 +43245,49 @@ msgstr "新建邮件"
 msgid "Post a message to a Public folder"
 msgstr "把邮件保存到文件夹中"
 
+# ui/evolution-mail-global.xml.h:24
+# ui/evolution-mail-global.xml.h:24
+# ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "订阅到文件夹(_S)..."
+
 # ui/evolution-mail-global.xml.h:15
 # ui/evolution-mail-global.xml.h:15
 # ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "显示邮件预览窗口"
 
 # ui/evolution-mail-global.xml.h:16
 # ui/evolution-mail-global.xml.h:16
 # ui/evolution-mail-global.xml.h:16
-#: 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:17
 # ui/evolution-mail-global.xml.h:17
 # ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "虚拟文件夹编辑器(_E)..."
 
 # ui/evolution-mail-global.xml.h:19
 # ui/evolution-mail-global.xml.h:19
 # ui/evolution-mail-global.xml.h:19
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "邮件过滤(_F)..."
 
 # ui/evolution-mail-global.xml.h:22
 # ui/evolution-mail-global.xml.h:22
 # ui/evolution-mail-global.xml.h:22
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "预览窗口(_P)"
 
-# ui/evolution-mail-global.xml.h:24
-# ui/evolution-mail-global.xml.h:24
-# ui/evolution-mail-global.xml.h:24
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "订阅到文件夹(_S)..."
-
 # ui/evolution-mail-list.xml.h:1
 # ui/evolution-mail-list.xml.h:1
 # ui/evolution-mail-list.xml.h:1
@@ -43175,7 +43453,7 @@ msgstr "删除(_E)"
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "文件夹(_F)"
 
@@ -43711,7 +43989,8 @@ msgstr "在显示邮件的邮件体中搜索文本"
 # ui/evolution-mail-message.xml.h:79
 # ui/evolution-mail-message.xml.h:81
 #: 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:80
@@ -43909,7 +44188,7 @@ msgstr "重命名(_R)..."
 # ui/my-evolution.xml.h:9
 # ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "工具(_T)"
 
@@ -43942,7 +44221,7 @@ msgstr "关闭该窗口"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -43953,7 +44232,7 @@ msgstr "关闭(_C)"
 # ui/evolution-mail-messagedisplay.xml.h:8
 # ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "查看(_V)"
 
@@ -44262,7 +44541,7 @@ msgstr "保存项并关闭对话框"
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "帮助(_H)"
 
@@ -44546,7 +44825,7 @@ msgid "Open Other _User's Folder..."
 msgstr "创建新文件夹(_N)..."
 
 #: 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:18
@@ -44571,17 +44850,33 @@ msgstr "在另一个窗口中打开该文件夹"
 msgid "Pi_lot Settings..."
 msgstr "Pilot 设置(_P)..."
 
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+#: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Pilot 设置(_P)..."
+
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "创建新文件夹(_N)..."
+
 # ui/evolution-mail-global.xml.h:13
 # ui/evolution-mail-global.xml.h:13
 # ui/evolution-mail-global.xml.h:13
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "发送和接收"
 
 # ui/evolution-mail-global.xml.h:14
 # ui/evolution-mail-global.xml.h:14
 # ui/evolution-mail-global.xml.h:14
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "发送编队的邮件并检索新邮件"
@@ -44589,7 +44884,15 @@ msgstr "发送编队的邮件并检索新邮件"
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:48
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "邮件配置"
+
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:48
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "邮件配置"
@@ -44597,98 +44900,98 @@ msgstr "邮件配置"
 # ui/evolution.xml.h:21
 # ui/evolution.xml.h:21
 # ui/evolution.xml.h:21
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "显示关于 Ximian Evolution 的信息"
 
 # ui/evolution.xml.h:22
 # ui/evolution.xml.h:22
 # ui/evolution.xml.h:22
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "提交错误报告"
 
 # ui/evolution.xml.h:23
 # ui/evolution.xml.h:23
 # ui/evolution.xml.h:23
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "提交错误报告(_B)"
 
 # ui/evolution.xml.h:24
 # ui/evolution.xml.h:24
 # ui/evolution.xml.h:24
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "反转"
 
 # ui/evolution.xml.h:26
 # ui/evolution.xml.h:26
 # ui/evolution.xml.h:26
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "是否显示文件夹栏"
 
 # ui/evolution.xml.h:27
 # ui/evolution.xml.h:27
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "是否显示快捷方式栏"
 
 # ui/evolution.xml.h:28
 # ui/evolution.xml.h:28
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "我们是否离线工作。"
 
 # ui/evolution.xml.h:29
 # ui/evolution.xml.h:29
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "查看选中的文件夹"
 
 # ui/evolution.xml.h:31
 # ui/evolution.xml.h:31
 # ui/evolution.xml.h:31
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution 常见问题(_F)"
 
 # ui/evolution.xml.h:32
 # ui/evolution.xml.h:32
 # ui/evolution.xml.h:32
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "关于 Ximian Evolution(_A)..."
 
 # ui/evolution.xml.h:34
 # ui/evolution.xml.h:34
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
 # ui/evolution.xml.h:38
 # ui/evolution.xml.h:38
 # ui/evolution.xml.h:38
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "文件夹工具栏(_F)"
 
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "文件夹(_F)"
@@ -44696,71 +44999,79 @@ msgstr "文件夹(_F)"
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "转到文件夹(_G)..."
 
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "正在导入(_I)..."
 
 # ui/evolution.xml.h:42
 # ui/evolution.xml.h:42
 # ui/evolution.xml.h:42
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "移动(_M)..."
 
 # ui/evolution.xml.h:43
 # ui/evolution.xml.h:43
 # ui/evolution.xml.h:43
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "新建(_N)"
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "新建文件夹(_N)"
 
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-#: ui/evolution.xml.h:56
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "没有循环(_N)"
+msgid "_Remove Other User's Folder"
+msgstr "创建新文件夹(_N)..."
 
 # ui/evolution.xml.h:46
 # ui/evolution.xml.h:46
 # ui/evolution.xml.h:46
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
 # ui/evolution-mail-global.xml.h:23
 # ui/evolution-mail-global.xml.h:23
 # ui/evolution-mail-global.xml.h:23
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "发送和接收(_S)"
 
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "邮件设置(_M)..."
+
 # ui/evolution.xml.h:48
 # ui/evolution.xml.h:48
 # ui/evolution.xml.h:48
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "快捷方式栏(_S)"
 
 # ui/evolution.xml.h:47
 # ui/evolution.xml.h:47
 # ui/evolution.xml.h:47
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "快捷方式(_S)"
@@ -45154,14 +45465,14 @@ msgstr "..."
 # widgets/misc/e-filter-bar.c:152
 # widgets/misc/e-filter-bar.c:153
 # widgets/misc/e-filter-bar.c:153
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "搜索编辑器"
 
 # widgets/misc/e-filter-bar.c:168
 # widgets/misc/e-filter-bar.c:169
 # widgets/misc/e-filter-bar.c:169
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "保存搜索"
 
@@ -45305,6 +45616,95 @@ msgstr "init_corba()： 无法初始化 GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()： 无法初始化 Bonobo"
 
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "删除(_R)"
+
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:31
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "添加(_A)"
+
+# camel/providers/imap/camel-imap-folder.c:1746
+# camel/providers/imap/camel-imap-folder.c:1746
+# camel/providers/imap/camel-imap-folder.c:1793
+#~ msgid "Scanning for new messages"
+#~ msgstr "正在扫描新邮件"
+
+# shell/e-storage.c:510
+# shell/e-storage.c:510
+# shell/e-storage.c:510
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "文件夹不为空"
+
+# composer/e-msg-composer-attachment-bar.c:101
+# composer/e-msg-composer-attachment-bar.c:101
+# composer/e-msg-composer-attachment-bar.c:101
+#~ msgid "1 byte"
+#~ msgstr "1 字节"
+
+# composer/e-msg-composer-attachment-bar.c:103
+# composer/e-msg-composer-attachment-bar.c:103
+# composer/e-msg-composer-attachment-bar.c:103
+#~ 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"
+#~ "请退回并指定一个合法的文件夹以便存入邮件。"
+
+# mail/mail-local.c:1296
+# mail/mail-local.c:1296
+# mail/mail-local.c:1296
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "由于 %s 不是本地文件夹，因此不能重新配置"
+
+# shell/e-shell-importer.c:243
+# shell/e-shell-importer.c:243
+# shell/e-shell-importer.c:243
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "正在导入 %s\n"
+#~ "导入没有就绪。\n"
+#~ "请 5 秒中以后再试。"
+
+# shell/importer/import.glade.h:3
+# shell/importer/import.glade.h:3
+# shell/importer/import.glade.h:3
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolution 导入器助手"
+
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "没有循环(_N)"
+
 # addressbook/backend/pas/pas-backend-file.c:270
 # addressbook/backend/pas/pas-backend-file.c:270
 # addressbook/backend/pas/pas-backend-file.c:270
@@ -45400,18 +45800,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "不参加"
 
-# composer/e-msg-composer.c:1405
-# composer/e-msg-composer.c:1322
-# composer/e-msg-composer.c:1288
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "该邮件尚未发送。\n"
-#~ "\n"
-#~ "您是否希望保存修改？"
-
 # mail/mail-accounts.c:149
 # mail/mail-accounts.c:149
 # mail/mail-accounts.c:149
@@ -45911,18 +46299,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "无法在参与者列表中找到您的任何身份！\n"
 
-# calendar/gui/itip-utils.c:370
-# calendar/gui/itip-utils.c:370
-# calendar/gui/itip-utils.c:370
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "忙闲信息 (%s 到 %s)"
-
-# calendar/gui/itip-utils.c:382
-# calendar/gui/itip-utils.c:382
-# calendar/gui/itip-utils.c:382
-#~ msgid "iCalendar information"
-#~ msgstr "iCalendar 信息"
-
 # camel/camel-cipher-context.c:211
 # camel/camel-cipher-context.c:209
 # camel/camel-cipher-context.c:209
@@ -46683,12 +47059,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "任务(_T)..."
 
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-#~ msgid "_Mail Settings..."
-#~ msgstr "邮件设置(_M)..."
-
 # ui/evolution-mail-message.xml.h:33
 # ui/evolution-mail-message.xml.h:33
 # ui/evolution-mail-message.xml.h:33
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 93b09fb32f..6f9a71f647 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.16.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: 2001-09-10 09:55+0800\n"
 "Last-Translator: Joe Man <trmetal@yahoo.com.hk>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -394,13 +394,20 @@ msgstr "�m"
 msgid "%x"
 msgstr "%x"
 
+# addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "���R�W���s���H"
+
 # addressbook/backend/ebook/e-card.c:3745
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "�h�� VCard"
 
 # addressbook/backend/ebook/e-card.c:3753
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "�� %s �� VCard"
@@ -421,9 +428,9 @@ msgstr "�� %s �� 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
@@ -432,51 +439,51 @@ msgstr "�����l�� Bonobo"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: 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 "�M��"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 #, fuzzy
 msgid "Loading..."
 msgstr "���b����..."
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "���b�s�u�ܦ��A��..."
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "���b�s�u�ܦ��A��..."
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "�����W��..."
 
-#: 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 ""
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "�����W���ɵo�Ϳ��~"
@@ -501,7 +508,7 @@ msgstr "�|�����J EBook\n"
 # calendar/conduits/calendar/calendar-conduit.c:731
 # calendar/conduits/todo/todo-conduit.c:545
 #: 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 �A��"
@@ -510,7 +517,7 @@ msgstr "����Ұ� wombat �A��"
 # calendar/conduits/calendar/calendar-conduit.c:732
 # calendar/conduits/todo/todo-conduit.c:546
 #: 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"
@@ -590,10 +597,10 @@ msgstr "²���ؿ��A�ȱ���u�t"
 
 # ui/evolution-addressbook.xml.h:17
 #: 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 "�s���H"
@@ -615,35 +622,47 @@ msgstr "NNTP ���A���G"
 msgid "LDAP server containing contact information"
 msgstr "��Ƨ��]�t�s���H��T"
 
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "�s���H"
+
+# mail/mail-callbacks.c:1349
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "��Ƨ��]�t�s���H��T"
+
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "�s�W�s���H"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "�s���H(_C)"
 
 # ui/evolution-addressbook.xml.h:2
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "�s�W�s���H"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "�s�W�s���H�M��"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "�s���H�M��(_C)"
 
 # ui/evolution-addressbook.xml.h:2
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "�s�W�s���H�M��"
@@ -708,7 +727,7 @@ msgstr "(���@������ evolution �ä��䴩 SSL)"
 # calendar/gui/alarm-notify/notify-main.c:98
 # calendar/gui/main.c:57
 #: 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 "����l��� gnome-vfs"
 
@@ -719,12 +738,12 @@ msgid "Other Contacts"
 msgstr "�s���H"
 
 # addressbook/gui/component/addressbook.c:438
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "����}�ҥؿ��A��"
 
 # addressbook/gui/component/addressbook.c:458
-#: 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."
@@ -733,7 +752,7 @@ msgstr ""
 "�z�O�_�֦��s���v���C"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -745,7 +764,7 @@ msgstr ""
 "�Ϊ� LDAP ���A���S���Ұ�"
 
 # addressbook/gui/component/addressbook.c:450
-#: 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"
@@ -757,7 +776,7 @@ msgstr ""
 "�Φw�� OpenLDAP�A�M��A���s�sĶ Evolution�C\n"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -768,25 +787,39 @@ msgstr ""
 "�o���ܱz��J�F�@�ӿ��~�� URI\n"
 "�Ϊ� LDAP ���A���S���Ұ�"
 
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+# camel/providers/imap/camel-imap-store.c:531
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"�L�k���Ҷi�J IMAP ���A���C\n"
+"%s\n"
+"\n"
+
 # camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
+#: 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 "�п�J %s �Ҷ����K�X"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "�H���׵�"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "�H���׵�"
 
 # calendar/gui/e-calendar-table.c:150
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "���O��"
@@ -794,18 +827,18 @@ msgstr "���O��"
 # addressbook/gui/component/addressbook.c:618
 # calendar/gui/gnome-cal.c:233
 #. 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 "�������]�t"
 
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "�i��..."
 
-#: 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"
@@ -813,7 +846,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"
@@ -821,27 +854,27 @@ 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 ""
 
 # calendar/gui/e-tasks.c:155
 #. 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 "�������O"
 
 # addressbook/gui/component/addressbook.c:763
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "��Ƨ��s������ܤ�URI"
 
@@ -922,61 +955,61 @@ msgstr "�Ұʬd��(�D�`�M�I�I)"
 msgid "  S_how Supported Bases "
 msgstr " �ˬd�i�䴩�����O(_C)"
 
-# addressbook/printing/e-contact-print.glade.h:23
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "�ﶵ"
-
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "����(_R)"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
 # calendar/gui/e-calendar-table.c:377
-#: 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 ""
 
 # calendar/gui/e-calendar-table.c:375
-#: 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/select-names/e-select-names-popup.c:161
+# composer/e-msg-composer-attachment-bar.c:468
+# shell/e-shortcuts-view.c:265
+# shell/e-shortcuts-view.c:388
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "���� (_R)"
+
+# addressbook/printing/e-contact-print.glade.h:23
+#: 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 ""
@@ -1142,20 +1175,26 @@ 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/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "�M��d��(_C)�G"
@@ -1163,33 +1202,33 @@ msgstr "�M��d��(_C)�G"
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h: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 "�M��"
 
 # ui/evolution-event-editor.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:57
-#: 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 "�w�R��"
 
-#: 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"
@@ -1200,7 +1239,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"
@@ -1209,50 +1248,50 @@ 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 ""
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "�ӷ���T"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "���b�s�u�ܦ��A��..."
 
-#: 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 ""
 
 # calendar/gui/print.c:362
-#: 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"
@@ -1260,7 +1299,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"
@@ -1269,7 +1308,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"
@@ -1277,7 +1316,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"
@@ -1287,7 +1326,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"
@@ -1297,27 +1336,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 "
@@ -1325,7 +1364,7 @@ msgid ""
 "It is for display purposes only. "
 msgstr "���W�ٱN�Ω��ѧO�z���b��.�Ȱ�����ܤ��ΡC"
 
-#: 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"
@@ -1333,11 +1372,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"
@@ -1346,28 +1385,28 @@ 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/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "�o�O�l�H�a�} (_T)"
 
-#: 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/contact-editor/contact-editor.glade.h:17
 # mail/mail-config.glade.h:84
-#: 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
@@ -1377,23 +1416,23 @@ msgstr "�s�W (_A)"
 
 # addressbook/contact-editor/contact-editor.glade.h:17
 # mail/mail-config.glade.h:84
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "�s�W (_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "�s�W�ʧ@"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "�s�W�ʧ@"
 
 # calendar/gui/e-calendar-table.c:162
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "����"
@@ -1405,27 +1444,27 @@ msgstr "����"
 # ui/evolution-mail.xml.h:103
 # ui/evolution-task-editor-dialog.xml.h:69
 # ui/evolution.xml.h:46
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "�����R��(_D)"
 
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "���(_D)"
 
-#: 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 ""
 
@@ -1435,7 +1474,7 @@ msgstr ""
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-#: addressbook/gui/component/ldap-config.glade.h: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
@@ -1446,7 +1485,7 @@ msgid "_Edit"
 msgstr "�s�� (_E)"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "�s����|(_E)"
@@ -1454,68 +1493,68 @@ msgstr "�s����|(_E)"
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: addressbook/gui/component/ldap-config.glade.h: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 ""
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:431
-#: 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 "�ﶵ(_O)"
 
 # addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "�q�T��(_P)�G"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr ""
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "�M��_�I(_B)�G"
 
 # calendar/gui/e-itip-control.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "���A���W��(_S)�G"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "����ɶ� (����)"
 
 # mail/mail-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "�b��"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "�s���H�M��s�边"
@@ -1524,43 +1563,43 @@ msgstr "�s���H�M��s�边"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "�S���W��"
 
 # mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "���_�P %s ���s�u"
 
-#: 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/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: 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/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "�M��"
@@ -1581,8 +1620,8 @@ msgstr "�ؿ��A�ȦW�ٿ�ܤ����u�t"
 # shell/e-shortcuts-view.c:388
 #. 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"
@@ -1620,12 +1659,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "���R�W���s���H"
 
-#: 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 "�q�ؿ��A�ȿ�ܳs���H"
 
 # addressbook/gui/component/addressbook.c:619
-#: 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 "�H��̥]�t"
@@ -1723,7 +1762,7 @@ msgstr "���� (_D)�G"
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: 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 "�ԲӸ��"
 
@@ -1803,13 +1842,13 @@ msgstr "���\���� HTML �榡���q�l�l��"
 # ui/evolution.xml.h:46
 #: 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 "�R�� (_D)"
 
@@ -1845,904 +1884,904 @@ msgid "_Web page address:"
 msgstr "Web ���}(_W)�G"
 
 # mail/mail-search.c:138
-#: 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/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "���I��"
 
-#: 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 "�����ΧQ��"
 
-#: 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 "�w�D��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "�w����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "�w�c�Ԯq"
 
 # shell/e-shell-importer.c:490
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "�n���w"
 
-#: 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 "�w�a�d�Τڥ��F"
 
 # addressbook/printing/e-contact-print.glade.h:24
-#: 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 "���c�ڮq"
 
-#: 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 "�D�j�Q��"
 
 # calendar/gui/goto-dialog.glade.h:2
-#: 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 "���a�Q"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "���ɫ��M"
 
-#: 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 "�ڪL"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "�s�[��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "�ڨ��h"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "�իXù��"
 
-#: 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 "��Q��"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: 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 "������"
 
 # mail/mail-send-recv.c:306
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Benin"
 msgstr "���n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "�ʼ}�F"
 
-#: 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 "���Q����"
 
-#: 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 "�i�h����-���ۮ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "�i����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "�i���S�q"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: 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 "�^�ݦL�׬v�a��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "�Z��"
 
-#: 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 "�O�[�Q��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Burkina Faso"
 msgstr "���N�Ǫk��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burundi"
 msgstr "�����a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "�Z�H�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "�س���"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: 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 "�[���j"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr "���w���q"
 
-#: 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 "�}�Ҹs�q"
 
-#: 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 "���D"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "�d�w"
 
 # addressbook/gui/component/addressbook-config.c:150
-#: 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 "���Q"
 
-#: 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 "�t�Ϯq"
 
-#: 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 "�i�i���s�q"
 
-#: 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 "���ۤ��"
 
 # ui/evolution-mail.xml.h:5
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "����"
 
 # mail/mail-ops.c:917
-#: 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 "��G�@�M��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "��J�s�q"
 
-#: 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 "�����j���["
 
-#: 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 "�H������"
 
-#: 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 "�Jù�J���"
 
-#: 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 "�j��"
 
-#: 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 "���J"
 
-#: 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 "�N���a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "�h�����J"
 
-#: 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 "�h�����["
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "�ҨZ"
 
-#: 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 "�̥ʦh"
 
-#: 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 "�J��"
 
-#: 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 "�ĺ��˦h"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "���D�X����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "�̧Q����"
 
-#: 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 "�R�F����"
 
-#: 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 "�֧J���s�q"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "�kù�s�q"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "���ٸs�q"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: 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 "����"
 
 # ui/evolution-mail.xml.h:2
-#: 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 "�k��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "�k�ݦc�Ȩ�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "�k�ݬ��������"
 
-#: 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 "�k�ݫn���ݦa"
 
-#: 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 "��v��"
 
-#: 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 "�w��"
 
-#: 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 "����ù��"
 
 # ui/evolution-calendar.xml.h:36
-#: 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/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "�泮��"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "��稺�F"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "�ʼw�|���q"
 
 # calendar/gui/e-day-view.c:570
 # calendar/gui/e-week-view.c:300
 # calendar/gui/print.c:617
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "���q"
 
-#: 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 "�ʦa����"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "�X����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "�X���Ȥ��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "�\�ȯ�"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: 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 "���a"
 
-#: 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 "���w�γ����Ҹs�q"
 
-#: 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 "����"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 # calendar/gui/event-editor.c:481
-#: 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 "�I���Q"
 
-#: 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 "�B�q"
 
-#: 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 "�L��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "�L��"
 
-#: 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 "�R����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "�H��C"
 
-#: 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 "�q�j�Q"
 
-#: 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 "���R�["
 
-#: 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 "���ħJ"
 
-#: 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 "�N���ڴ�"
 
-#: 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 "��¯S"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "�N���N��"
 
 # mail/message-list.c:685
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "�d��"
 
-#: 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 "���ڹ�"
 
 # mail/message-list.c:685
-#: 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 "�C�䴰���n"
 
-#: 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 "�c�˳�"
 
 # calendar/gui/goto-dialog.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr "�D��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "����y"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "���F�[���["
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: 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 "�����a��"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "���Q"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: 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 "�����L"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Marshall Islands"
 msgstr "����s�q"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "�k�ݰ��B���J"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "�T�Q�𥧨�"
 
 # addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "�Ҩ��贵"
 
 # calendar/gui/goto-dialog.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "���ȯS"
 
-#: 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 "�K�Jù�����"
 
-#: 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 ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/event-editor.c:475
-#: 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 "�X�j"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "�X��ԯS�q"
 
-#: 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/contact-editor/e-contact-editor.c:1253
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "���T��J"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "�q�l"
 
-#: 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 "�վ|"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "���y��"
 
 # addressbook/contact-editor/contact-editor.glade.h:12
-#: 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 "���ݦw�a�C��"
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "�s�ب��h���Ȯq"
 
-#: 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 "���[�ԥ�"
 
 # mail/message-list.c:690
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "����"
 
 # mail/message-list.c:690
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "�`�ΧQ��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "�ë®q"
 
-#: 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 "�պ֧J�s�q"
 
-#: 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 "�_�����ȯǸs�q"
 
 # widgets/misc/e-cell-date-edit.c:221
 # widgets/misc/e-dateedit.c:418
-#: 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 "����"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: 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 "�ڰ򴵩Z"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "���[�s�q"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 #, fuzzy
 msgid "Palestinian Territory"
 msgstr "�^�ݦL�׬v�a��"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: 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 "�ڥ��ȯôX����"
 
-#: 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 "�کԦc"
 
 # addressbook/printing/e-contact-print.glade.h:27
-#: 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 "��߻�"
 
 # ui/evolution-calendar.xml.h:25
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "�֯S�d"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: 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 "�i��"
 
 # addressbook/printing/e-contact-print.glade.h:29
-#: 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 "�i�h���U"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: 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 "�d�F"
 
 # addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "�d����"
 
-#: 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 "�Xù��"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "�c�w�F"
 
-#: 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 "�t�J�����h��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "�t�S���"
 
-#: 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 "�t���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "�ļ��ȸs�q"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "San Marino"
 msgstr "�t���Q��"
 
-#: 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 "�t�h����L���"
 
-#: 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 "�F�Q�a���ԧB"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "�뤺�[��"
 
 # calendar/gui/e-meeting-dialog.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "��u��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "��l�s"
 
-#: 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 "�s�[�Y"
 
-#: 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 "������J"
 
-#: 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 "�����Z����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "��ù���s�q"
 
@@ -2752,71 +2791,71 @@ msgstr "��ù���s�q"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "�����Q��"
 
-#: 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 "�n�D"
 
-#: 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 "�n��v�ȤΫn��©_�s�q"
 
 # ui/evolution-message-composer.xml.h:26
-#: 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 "��Z��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "�������d"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "�t���Ǯ��q"
 
-#: 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 "�t�ǤαK�ҭ۸s�q"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: 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/widgets/e-addressbook-view.c:734
-#: 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 "Ĭ�Q�n"
 
-#: 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 "���ˤڤΦy�֮q"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "�v������"
 
 # mail/message-list.c:678
-#: 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 "��h"
 
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
-#: 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 "�O�W"
@@ -2824,47 +2863,47 @@ msgstr "�O�W"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "��N�J"
 
-#: 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 "�Z�|����"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "����"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "�h��"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "���J�Ҹs�q"
 
 # ui/evolution-calendar.xml.h:34
 # widgets/misc/e-cell-date-edit.c:229
 # widgets/misc/e-dateedit.c:424
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "�F�["
 
-#: 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 "�d���F"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "�𥧦��"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: 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 "�g�ը�"
@@ -2874,99 +2913,99 @@ msgstr "�g�ը�"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "�g�w��"
 
-#: 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 "�g�J���ζ}�촵�s�q"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "�R�˾|"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "�Q�z�F"
 
-#: 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 "�Q�J��"
 
-#: 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 "���ԧB�p�X�j����"
 
-#: 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 "������æ�s�q"
 
-#: 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 "�Q�Ԧc"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "�Q���O�J"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "�U����"
 
-#: 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 "�e�����"
 
 # addressbook/gui/component/select-names/select-names.glade.h:3
-#: 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 "�V�n"
 
-#: 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 "���ݺ����ʸs�q"
 
-#: 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 "���ݺ����ʸs�q"
 
-#: 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 "�U�����P��𨺮q"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "�輻����"
 
 # mail/message-list.c:678
-#: 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 "�n���Ԥ�"
 
-#: 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 "���ګ�"
 
@@ -3017,24 +3056,24 @@ msgid "Could not find widget for a field: `%s'"
 msgstr "��������� `%s' ���ɭ��u��"
 
 # addressbook/contact-editor/e-contact-quick-add.c:233
-#: 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 "�ֳt�s�W�s���H"
 
 # addressbook/contact-editor/e-contact-quick-add.c:235
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "�s�����"
 
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
-#: 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 "���W"
 
 # addressbook/contact-editor/e-contact-quick-add.c:282
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "�q�l�l��"
 
@@ -3058,6 +3097,21 @@ msgstr ""
 "%s �w�g�s�b\n"
 "�z�O�_�n�Ƽg��?"
 
+#: 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 ""
+
+# mail/mail-callbacks.c:1140
+# mail/mail-display.c:92
+#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#, fuzzy
+msgid "Overwrite"
+msgstr "�л\�ɮסH"
+
 # addressbook/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
@@ -3225,7 +3279,7 @@ msgstr "�s���H�M��s�边"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/contact-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 "�x�s�� VCard �ɮ׮榡"
@@ -3281,7 +3335,7 @@ msgstr ""
 
 # widgets/misc/e-filter-bar.c:239
 #: 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 "�i���M��"
 
@@ -3296,29 +3350,29 @@ msgstr "�M��"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "�S���W��"
 
 # ui/evolution-calendar.xml.h:25
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 �i�W��"
 
 # calendar/gui/event-editor.c:1563
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr " %d �i�W��"
 
 # shell/e-shell-importer.c:384
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "�Ұ� %s �ɵo�Ϳ��~"
 
 # shell/e-shell-importer.c:404
-#: 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"
@@ -3332,10 +3386,10 @@ msgstr "���\"
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
 #: 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 "���������~"
 
@@ -3346,7 +3400,7 @@ msgid "Repository offline"
 msgstr "��Ʈw���u"
 
 # shell/e-storage.c:475
-#: 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 "�v������"
@@ -3375,8 +3429,8 @@ msgstr "�q�T��w���䴩"
 #: 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 "�w����"
 
@@ -3440,7 +3494,7 @@ msgstr "�����M��ɵo�Ϳ��~"
 # executive-summary/component/e-summary.c:940
 #: 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 "�����W���ɵo�Ϳ��~"
 
@@ -3461,9 +3515,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 ""
 
 # mail/mail-callbacks.c:850
@@ -3583,7 +3636,7 @@ msgstr "�ؿ��A��"
 # addressbook/gui/widgets/e-addressbook-view.c:611
 #: 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 "�x�s�� VCard �ɮ׮榡"
@@ -3708,7 +3761,7 @@ msgstr "�K�W"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: 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
@@ -3717,8 +3770,8 @@ msgid "Delete"
 msgstr "�R��"
 
 # widgets/menus/gal-view-menus.c:176
-#: 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 "�ثe�˵�(_C)"
@@ -3727,7 +3780,7 @@ msgstr "�ثe�˵�(_C)"
 #. 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"
 
@@ -3735,11 +3788,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"
@@ -3901,7 +3954,7 @@ msgstr "�]�t�G"
 
 # addressbook/printing/e-contact-print.glade.h:18
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "��V"
 
@@ -3933,7 +3986,7 @@ msgstr "�ﶵ"
 
 # addressbook/printing/e-contact-print.glade.h:24
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "�ȱi��V"
 
@@ -3961,7 +4014,7 @@ msgstr "�ȱi�ӷ��G"
 # addressbook/printing/e-contact-print.glade.h:29
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "�a�V"
 
@@ -4043,7 +4096,7 @@ msgstr "�s����|(_E)"
 # mail/message-list.c:689
 #: 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 "��"
 
@@ -4056,7 +4109,7 @@ 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 "���q"
 
@@ -4067,7 +4120,7 @@ msgstr "���q"
 # mail/message-list.c:687
 #: 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 "�C"
 
@@ -4081,17 +4134,21 @@ msgstr "�C"
 msgid "Undefined"
 msgstr "�����w"
 
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
 # calendar/conduits/calendar/calendar-conduit.c:687
 # calendar/conduits/todo/todo-conduit.c:501
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "�P��ƾ���A���q�T�ɵo�Ϳ��~"
 
 # calendar/conduits/calendar/calendar-conduit.c:786
 # calendar/conduits/calendar/calendar-conduit.c:789
-#: 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 ��ƾ�{���϶�"
 
@@ -4241,11 +4298,11 @@ msgid "_Edit appointment"
 msgstr "�s����|(_E)"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "�S���y�z�C"
 
-#: 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"
@@ -4254,13 +4311,13 @@ msgid ""
 msgstr ""
 
 # widgets/misc/e-messagebox.c:159
-#: 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 "ĵ�i"
 
-#: 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 "
@@ -4274,19 +4331,19 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: 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 "���n�A��ܳo�ӰT���C"
 
 # calendar/gui/alarm-notify/notify-main.c:93
 # calendar/gui/main.c:52
-#: 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 "�����l�� GNOME"
 
 # calendar/gui/alarm-notify/notify-main.c:108
-#: 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 "����إ��n�������A�Ȥ���u�t"
 
@@ -4350,7 +4407,7 @@ msgid "%d %B"
 msgstr "%d %B"
 
 # calendar/gui/calendar-commands.c:468
-#: 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 "����إߦ�ƾ��˵��C  ���ˬd ORBit �M OAF ���]�w�C"
@@ -4469,9 +4526,9 @@ msgstr ""
 # widgets/misc/e-dateedit.c:1456
 #. 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
@@ -4491,14 +4548,14 @@ msgstr "�w���w"
 
 # calendar/gui/calendar-model.c:1584
 #: 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 "�O"
 
 # calendar/gui/calendar-model.c:1584
 #: 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 "�_"
 
@@ -4524,103 +4581,126 @@ msgstr "���˵�"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: 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 "��Ƨ��]�t���|�P�ƥ�"
 
+# calendar/gui/print.c:1156
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "�C�L��ƾ�"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "��Ƨ��]�t���|�P�ƥ�"
+
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: 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: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 "�u�@"
 
 # mail/folder-browser.c:871
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "��Ƨ��]�t�ݿ�ƶ�"
 
+# ui/evolution-calendar.xml.h:25
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "�C�L�W��"
+
+# mail/folder-browser.c:871
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "��Ƨ��]�t�ݿ�ƶ�"
+
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "�s�W���|"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "���|"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "�إߤ@�ӷs�����|"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "�s�D�o�e���A���]�w"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "�|ij"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "�إߤ@�ӷs���u�@"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "�s�W�u�@"
 
 # ui/evolution-tasks.xml.h:9
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "�u�@(_T)"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "�إߤ@�ӷs���u�@"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�s�W���|"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�s�W���|(_A)"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "�إߤ@�ӷs�����|"
@@ -4668,33 +4748,33 @@ msgstr "�����������ﶵ"
 msgid "Alarm Repeat"
 msgstr "��������"
 
-# views/mail/galview.xml.h:4
 #: 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 ""
+
+# views/mail/galview.xml.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "��ܶl��"
 
 # calendar/gui/event-editor-dialog.glade.h:14
 # calendar/gui/event-editor.c:1588
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "���񭵮ġG"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "���ƴ���"
 
 # calendar/gui/event-editor-dialog.glade.h:22
 # calendar/gui/event-editor.c:1597
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "����{���G"
 
-#: 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 "�㦳�o�ǰѼơG"
@@ -4720,132 +4800,132 @@ msgid "minutes"
 msgstr "��"
 
 # calendar/gui/event-editor.c:1543
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr " %d ��"
 
 # calendar/gui/event-editor.c:1545
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr " 1 ��"
 
 # calendar/gui/event-editor.c:1548
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr " %d �g"
 
 # calendar/gui/event-editor.c:1550
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr " 1 �g"
 
 # calendar/gui/event-editor.c:1553
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr " %d �p��"
 
 # calendar/gui/event-editor.c:1555
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr " 1 ��"
 
 # calendar/gui/event-editor.c:1558
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr " %d ��"
 
 # calendar/gui/event-editor.c:1560
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr " 1 ��"
 
 # calendar/gui/event-editor.c:1563
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr " %d ��"
 
 # calendar/gui/event-editor.c:1565
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr " 1 ��"
 
 # calendar/gui/event-editor-dialog.glade.h:14
 # calendar/gui/event-editor.c:1588
-#: 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 "����o�ӭ���"
 
 # ui/evolution-mail.xml.h:23
-#: 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 "��ܶl��"
 
 # calendar/gui/event-editor-dialog.glade.h:23
 # calendar/gui/event-editor.c:1594
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "�ǰe�q�l�l��"
 
 # calendar/gui/event-editor-dialog.glade.h:22
 # calendar/gui/event-editor.c:1597
-#: 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/event-editor.c:1612
-#: 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 "���|�}�l�e"
 
 # calendar/gui/event-editor.c:1612
-#: 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 "���|�}�l�e"
 
 # calendar/gui/event-editor.c:1612
-#: 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 "���|�}�l�e"
 
 # calendar/gui/event-editor.c:1612
-#: 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 "���|�}�l�e"
 
 # calendar/gui/event-editor.c:1624
-#: 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 "���|������"
 
 # calendar/gui/event-editor.c:1624
-#: 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 "���|������"
 
-#: 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 ""
@@ -4871,7 +4951,7 @@ msgstr "����"
 # calendar/gui/e-itip-control.glade.h:11
 #: 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 "�K�n�G"
 
@@ -4973,7 +5053,7 @@ msgstr "��"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/event-editor.c:479
 #: 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 "�P����"
 
@@ -4989,7 +5069,7 @@ msgstr "��"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/event-editor.c:475
 #: 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 "�P���@"
 
@@ -5002,7 +5082,7 @@ msgstr "�g��(_N)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/event-editor.c:480
 #: 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 "�P����"
 
@@ -5018,7 +5098,7 @@ msgstr "�b���������ܶg��(_N)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 # calendar/gui/event-editor.c:481
 #: 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����"
 
@@ -5044,7 +5124,7 @@ msgstr "�u�@�M��(_T)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 # calendar/gui/event-editor.c:478
 #: 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 "�P���|"
 
@@ -5066,7 +5146,7 @@ msgstr "�ɶ��榡�G"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 # calendar/gui/event-editor.c:476
 #: 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 "�P���G"
 
@@ -5077,7 +5157,7 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 # calendar/gui/event-editor.c:477
 #: 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 "�P���T"
 
@@ -5344,8 +5424,8 @@ msgstr "�S���K�n"
 
 # composer/e-msg-composer.c:774
 #: 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 "�t�s�s��..."
 
@@ -5427,33 +5507,33 @@ msgid "Enter Delegate"
 msgstr "��J�N��"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: 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/event-editor-dialog.glade.h:20
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "����"
 
 # calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "�g����"
 
 # ui/evolution-event-editor.xml.h:46
-#: 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 "�|ij�Ƶ{(_M)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: 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 "�|ij"
 
@@ -5548,22 +5628,22 @@ msgstr "�����ɶ� (_E)�G"
 msgid "_Start time:"
 msgstr "�}�l�ɶ� (_S)�G"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 #, fuzzy
 msgid "An organizer is required."
 msgstr "�������w�@�ӥl���H�C"
 
-#: 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 "���H�w�g�X�u���|ij!"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "�e����(_D)..."
 
@@ -5612,7 +5692,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"
@@ -5626,7 +5706,7 @@ msgstr "����"
 # mail/message-list.c:1081
 #: 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 "���p"
@@ -5712,57 +5792,57 @@ msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution �L�k�s��o�Ӷg���ʬ��|�C"
 
 # calendar/gui/event-editor.c:449
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "��"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "�G"
 
-#: 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 "��"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "�D�u"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "�_"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "�G"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "�䥦�ǯu"
 
 # calendar/gui/event-editor.c:474
-#: 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 "�C��"
 
 # calendar/gui/event-editor.c:601
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "�b��"
 
 # calendar/gui/event-editor.c:754
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "�X�{"
 
@@ -5879,7 +5959,7 @@ msgstr "��������G"
 # shell/importer/import.glade.h:5
 #: 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�ʧ@"
 
@@ -5890,7 +5970,7 @@ msgstr "�i��"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:21
 #: 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 "���}�G"
 
@@ -5904,21 +5984,21 @@ msgstr "�u������(_P)�G"
 msgid "_Status:"
 msgstr "���A(_S)�G"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "��"
 
 # calendar/gui/calendar-model.c:1578
-#: 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 "�����u�@"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c: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:"
@@ -6002,14 +6082,14 @@ msgstr "100%"
 
 # calendar/gui/e-calendar-table.c:714
 #: 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 "�R����w���s���H"
 
 # mail/folder-browser.c:686
-#: 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 "�}��(_O)"
@@ -6023,8 +6103,8 @@ msgstr "�t�s�s��..."
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-contact-editor.xml.h:15
-#: calendar/gui/e-calendar-table.c: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
@@ -6033,16 +6113,16 @@ msgstr "�C�L(_P)..."
 
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-task-editor-dialog.xml.h:7
-#: 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 "�ŤU(_U)"
 
 # ui/evolution-event-editor.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:67
-#: 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"
@@ -6050,9 +6130,9 @@ msgstr "�ƻs(_C)"
 
 # ui/evolution-event-editor.xml.h:68
 # ui/evolution-task-editor-dialog.xml.h:81
-#: 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"
@@ -6087,13 +6167,13 @@ msgstr "�Хܬ��w�������u�@(_M)"
 msgid "_Delete Selected Tasks"
 msgstr "�R����w���u�@(_D)"
 
-#: 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:163
-#: 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 "�Ы��o�̷s�W�s���u�@"
@@ -6105,8 +6185,8 @@ msgstr "����"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: 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 "����"
 
@@ -6144,7 +6224,7 @@ msgstr "�}�l���"
 
 # calendar/gui/e-calendar-table.c:159
 #: 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 "�K�n"
@@ -6235,61 +6315,61 @@ msgstr "�U��"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "�s�W���|(_A)"
 
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: 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 "�s�W���ѭn��(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: 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 "�|ij"
 
 # ui/evolution-tasks.xml.h:3
-#: 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 "�s�W�u�@"
 
 # ui/evolution-contact-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:38
 # ui/evolution-task-editor-dialog.xml.h:41
-#: calendar/gui/e-day-view.c: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 "�C�L..."
 
 # ui/evolution-calendar.xml.h:12
-#: 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 "����(_T)"
 
 # calendar/gui/e-day-view.c:3155
 # calendar/gui/e-week-view.c:3286
-#: 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 "����w���(_G)..."
 
 # mail/mail-config.glade.h:61
-#: 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 "�o�G �Ŷ�/���L ��T(_P)"
 
 # mail/mail-config.glade.h:40
-#: 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 "�l��]�w"
 
 # mail/mail-config.glade.h:40
-#: 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 "�l��]�w"
@@ -6298,58 +6378,58 @@ msgstr "�l��]�w"
 # ui/evolution-calendar.xml.h:43
 # ui/evolution-mail.xml.h:118
 # ui/evolution-tasks.xml.h:8
-#: 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 "�t�s�s��(_S)..."
 
 # ui/evolution-event-editor.xml.h:46
-#: 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 "�|ij�Ƶ{(_M)"
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: 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 "�H i_Calendar ��H"
 
 # calendar/gui/e-day-view.c:3175
 # calendar/gui/e-week-view.c:3309
-#: 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 "�N�o�Өƥ�Хܦ��i����(_M)"
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: 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 "�R���o�Өƥ�(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: 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 "�R�������ƥ�(_A)"
 
-#: 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 ""
 
 # camel/camel-filter-driver.c:871
-#: 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 "����L�o���o�Ϳ��~�G %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
 msgid "<b>Ends:</b> "
 msgstr ""
 
@@ -6357,17 +6437,17 @@ msgstr ""
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "�w����"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
 # data/evolution.keys.in.h:2
-#: 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 "��ƾ��T"
@@ -6375,31 +6455,31 @@ msgstr "��ƾ��T"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "��ƾ�"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: 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 "�������H���"
 
 #. 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 ""
 
 # addressbook/backend/ebook/e-card.c:3442
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr ""
@@ -6407,26 +6487,26 @@ msgstr ""
 "�g�n�G"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "���A(_S)�G"
 
-#: 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 "����"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: 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 "�ȭq"
 
-#: 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 "����"
 
@@ -6434,336 +6514,344 @@ msgstr "����"
 # calendar/gui/event-editor.c:1601
 # calendar/gui/event-editor.c:1628
 # camel/providers/smtp/camel-smtp-transport.c:221
-#: calendar/gui/e-itip-control.c: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 "����"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: 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 "��ܤ@�Ӱʧ@"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 #, fuzzy
 msgid "Update"
 msgstr "�u�@��s"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: 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 "�T�{"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 #, fuzzy
 msgid "Accept"
 msgstr "����"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "�ȭq"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 #, fuzzy
 msgid "Decline"
 msgstr "����"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "�Ŷ�/���L ��T"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr ""
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "�u�@��T"
 
 # ui/evolution-mail.xml.h:2
-#: 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> �w�g�o�G�|ij��T�C"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "�|ij��T"
 
-#: 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> �ШD�z�X�u�����|ij�C"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "�|ij����"
 
-#: 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> �Ʊ�[�J�@�ӬJ�s���|ij�C"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "�|ij��s"
 
-#: 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> �Ʊ榬��̷s���|ij��T�C"
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "�|ij��s�ШD"
 
-#: 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> �w�g���ФF�|ij�ШD�C"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "�|ij����"
 
-#: 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> �w�g�����|ij�C"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "�|ij����"
 
-#: 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�F�@�����H�z�Ѫ��T���C"
 
 # mail/mail-search.c:268
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "�����T���|ij�T��"
 
-#: 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> �w�g�o�G�F�u�@��T�C"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "�u�@��T"
 
-#: 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> �n�D�z�i��u�@�C"
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "�u�@�p�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> �Ʊ�[�J�@���J�s���u�@�C"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "�u�@��s"
 
-#: 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> �Ʊ榬��̷s���u�@��T�C"
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "�u�@��s�ШD"
 
-#: 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> �w�g�^�������u�@�C"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "�u�@�^��"
 
-#: 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> �w�g�����u�@�C"
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "�u�@����"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "�����T���u�@�T��"
 
-#: 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> �w�g�o�G �Ŷ�/���L ��T�C"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "�Ŷ�/���L ��T"
 
-#: 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> �ШD�z�� �Ŷ�/���L ��T�C"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "�Ŷ�/���L �ШD"
 
-#: 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> �w�g���� �Ŷ�/���L �ШD�C"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "�Ŷ�/���L �^��"
 
 # mail/mail-callbacks.c:1407
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "�����T�� �Ŷ�/���L �T��"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: 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 "��Ƨ��n���w�g�l���åB����_��C"
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "�o�Ӷl��u�]�t�K��ƥ�����̡C"
 
-#: 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
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "�U���s�D�o�e���A���ɵo�Ϳ��~"
 
-#: 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 "����ǰe�o�Ӷ��ءI\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/gnome-cal.c:840
+#: 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/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "��s����\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "����ǰe�o�Ӷ��ءI\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/gnome-cal.c:840
+#: 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
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "����ǰe�o�Ӷ��ءI\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: 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 "���ضǰe�I\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 "����ǰe�o�Ӷ��ءI\n"
 
 # mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "��ܸ�Ƨ�"
 
 # mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "��ܸ�Ƨ�"
@@ -6821,7 +6909,7 @@ msgid "Chair Persons"
 msgstr "�D�u"
 
 # mail/mail-config.glade.h:61
-#: 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 "�X�u��"
 
@@ -6836,57 +6924,57 @@ 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 "�ӤH"
 
 # shell/e-shortcuts-view.c:137
 #: 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 "�էO"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: 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 "�|ij��"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: 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 "�D�u"
 
 # mail/mail-config.glade.h:61
 #: 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 "�X�u��"
 
 #: 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 "�C�u��"
 
 #: 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 "�ʮu��"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: 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 "�ȭq"
 
 #: 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 "�w�e��"
 
@@ -7006,51 +7094,59 @@ msgid "Meeting _end time:"
 msgstr "�|ij�����ɶ�(_E)�G"
 
 # mail/mail-ops.c:1262
-#: 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 "�}�ҶJ�� %s"
 
 # calendar/gui/e-tasks.c:298
-#: 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 "������J `%s' �̪��u�@"
 
 # calendar/gui/e-tasks.c:310
-#: 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 "���䴩�Χ@���J `%s'  ��������k"
 
 # calendar/gui/gnome-cal.c:840
-#: 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' ������Ƨ�"
 
+# shell/e-shell-importer.c:384
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "�Ұ� %s �ɵo�Ϳ��~"
+
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "�������"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "�R����w���s���H"
 
 # mail/mail-ops.c:1449
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "�R����Ƨ�"
 
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "�s�W���|(_A)..."
 
@@ -7066,7 +7162,14 @@ msgstr "����}�� `%s' ������Ƨ�"
 msgid "The method required to open `%s' is not supported"
 msgstr "���䴩�Χ@�}�� `%s'  ��������k"
 
-#: calendar/gui/gnome-cal.c:1734
+# calendar/gui/e-calendar-table.c:162
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "����"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -7074,7 +7177,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"
@@ -7084,14 +7187,14 @@ msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�}�Ҹ�Ƨ� %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "�}�Ҹ�Ƨ� %s"
@@ -7166,60 +7269,72 @@ msgstr "10��"
 msgid "September"
 msgstr "9��"
 
-#: 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 "�������w�@�ӥl���H�C"
 
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr ""
+
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 #, fuzzy
 msgid "Event information"
 msgstr "��ƾ��T"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "�u�@��T"
 
 # mail/mail-config.glade.h:47
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "�����T"
 
 # mail/mail-config.glade.h:61
-#: 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 ��T"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 msgid "Calendar information"
 msgstr "��ƾ��T"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "�u�@��s"
 
 # ui/evolution-subscribe.xml.h:4
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "����M��"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+# mail/mail-config.glade.h:61
+#: calendar/gui/itip-utils.c:596
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "�Ŷ�/���L ��T"
+
+# data/evolution.keys.in.h:2
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "��ƾ��T"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -7533,7 +7648,7 @@ msgstr "�C�L��ƾ�"
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
 #: 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 "�w���C�L"
@@ -7563,7 +7678,7 @@ msgstr "����إߦ�ƾ��˵��C  ���ˬd ORBit �M OAF ���]�w�C"
 msgid "The URI of the tasks folder to display"
 msgstr "�u�@��Ƨ���ܪ� 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 "
@@ -7579,13 +7694,13 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: 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 "���n�A��ܳo�ӰT���C"
 
 # ui/evolution-calendar.xml.h:25
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "�C�L�W��"
@@ -7666,19 +7781,19 @@ msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "������s�u����A���G%s"
 
 # calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "����"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "��ƾ�T��"
 
 # importers/pine-importer.c:705
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -7689,95 +7804,95 @@ msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: 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 �n�D 0 �ӰѼ�"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time �n�D 1 �ӰѼ�"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time �n�D�Ѽ� 1 ���r��"
 
-#: 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 ������ ISO 8601 ���/�ɶ��r��"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day �n�D 2 �ӰѼ�"
 
-#: 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 �n�D�Ѽ� 1 �� 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 �n�D�Ѽ� 2 �����"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin �n�D 1 �ӰѼ�"
 
-#: 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 �n�D�Ѽ� 1 �� time_t"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end �n�D 1 �ӰѼ�"
 
-#: 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 �n�D�Ѽ� 1 �� time_t"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype �n�D 0 �ӰѼ�"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? �n�D 2 �ӰѼ�"
 
-#: 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? �n�D�Ѽ� 1 �� 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? �n�D�Ѽ� 2 �� time_t"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? �n�D 2 �ӰѼ�"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? �n�D�Ѽ� 1 ���r��"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? �n�D�Ѽ� 2 ���r��"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr "contains? �n�D�Ѽ� 1 �� \"any\", \"summary\", \"description\" �䤤���@"
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? �n�D�ܤ� 1 �ӰѼ�"
 
-#: 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)"
@@ -7785,25 +7900,31 @@ msgstr ""
 "has-categories? �n�D�Ҧ����ѼƬ��r��ζȦ����@�Ӭ����L�� false(#f) ���Ѽ�"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? �n�D 0 �ӰѼ�"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "is-completed? �n�D 0 �ӰѼ�"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin �n�D�Ѽ� 1 �� 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 "�j�M���ܥX���ȵ��G���ର���L��"
 
+# shell/e-storage.c:467
+#: 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.
@@ -9539,107 +9660,107 @@ msgstr "�z������u�W�u�@�~�৹�����ާ@"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: 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 "�P�B�B�z��Ƨ�"
 
 # camel/camel-filter-driver.c:866
-#: 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 "���R�L�o���o�Ϳ��~�G %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: 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 "����L�o���o�Ϳ��~�G %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "�L�k�}�� spool ��Ƨ�"
 
 # camel/camel-filter-driver.c:652
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "�L�k�B�z spool ��Ƨ�"
 
 # camel/camel-filter-driver.c:666
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "�����l�� %d (%d%%)"
 
 # camel/camel-filter-driver.c:671
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "����}�Ҷl��"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: 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 "�b�� %d �ʶl��o�Ϳ��~"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: 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 "�P�B�B�z��Ƨ�"
 
 # camel/camel-filter-driver.c:748
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���b������ %d / %d �ʶl��"
 
 # camel/camel-filter-driver.c:753
 # camel/camel-filter-driver.c:771
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "�b�� %d / %d �ʶl�󥢱�"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "�L�Ī��Ѽ�"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "�L�Ī��Ѽ�"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: 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 "�ѱK�l�󥢱ѡC"
 
 # camel/camel-filter-search.c:439
 # camel/camel-filter-search.c:445
-#: 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 "����L�o���j�M�o�Ϳ��~�G %s: %s"
@@ -9695,13 +9816,13 @@ msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
 # mail/mail-ops.c:898
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Moving messages"
 msgstr "�N�l�󲾨� %s"
 
 # mail/mail-ops.c:898
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "�N�l��ƻs�� %s"
@@ -10080,7 +10201,7 @@ msgstr ""
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
 #: 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 "�Ӧۦ��A�������}�\�i�^���C"
 
@@ -10145,61 +10266,61 @@ msgid "Regular expression compilation failed: %s: %s"
 msgstr "���W���ܦ��sĶ���ѡG %s�G %s"
 
 # camel/camel-service.c:154
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ���n username ����"
 
 # camel/camel-service.c:162
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ���n host ����"
 
 # camel/camel-service.c:170
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ���n path ����"
 
 # camel/camel-service.c:548
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "�ѪR�G%s"
 
 # camel/camel-service.c:575
-#: 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 "�j�M�W�٥��ѡG %s"
 
 # camel/camel-service.c:600
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "�j�M�D�����ѡG %s �G�䤣��D��"
 
 # camel/camel-service.c:602
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "�j�M�D�����ѡG %s �G������]"
 
 # camel/camel-service.c:548
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "�ѪR�G%s"
 
 # camel/camel-service.c:600
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "�j�M�D�����ѡG %s �G�䤣��D��"
 
 # camel/camel-service.c:602
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "�j�M�D�����ѡG %s �G������]"
@@ -10418,7 +10539,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"
@@ -10427,11 +10548,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 ""
 
@@ -10457,7 +10578,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
 #. 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"
@@ -10530,74 +10651,83 @@ msgstr "����N��Ƨ� %s ���s�R�W�� %s�G %s"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: 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 "��ʤw����"
 
 # camel/camel-remote-store.c:476
-#: 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 "���A����M���_�s�u"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: 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 "�q IMAP ���A���Ǧ^�������^���G %s"
+
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "�q IMAP ���A���Ǧ^�������^���G %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: 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 ���O���ѡG %s"
 
 # camel/providers/imap/camel-imap-command.c:295
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "���A���Ӧ��Ǧ^�������^���C"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: 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 ���A�����^���S���]�t %s ��T"
 
 # camel/providers/imap/camel-imap-command.c:524
-#: 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 "�q IMAP ���A���Ǧ^������ OK �^���G %s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: 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�G %s"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: 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 "������J�� %s ���K�n"
 
-#: 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 "��Ƨ��w�}�a�æb���A���W���ءC"
 
 # mail/mail-ops.c:1649
 #. 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 "���y�ܧ�L���l��"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: 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 "�ѱK�l�󥢱ѡC"
@@ -10609,7 +10739,7 @@ msgstr "�ѱK�l�󥢱ѡC"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: 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
@@ -10628,7 +10758,7 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: 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
@@ -10637,24 +10767,19 @@ msgstr "�S���o�ʶl��"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: 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 "�o�ʶl��ثe�����i��"
 
-#: 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 "�����o�s�l�󪺺K�n��T"
 
-# mail/mail-ops.c:992
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "���y�s�l��"
-
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: 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 "�b FETCH ���^�����䤣��l�󪺤���C"
 
@@ -10674,6 +10799,13 @@ msgstr "����}�ҧ֨��ؿ��G%s"
 msgid "Failed to cache message %s: %s"
 msgstr "�ѱK�l�󥢱ѡC"
 
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "�ѱK�l�󥢱ѡC"
+
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
 #: camel/providers/imap/camel-imap-provider.c:43
@@ -10739,19 +10871,19 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "�o�ӿﶵ�N�|�ϥ�²�����K�X�s�u�� IMAP ���A���C"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: 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 ���A�� %s"
 
 # camel/camel-remote-store.c:195
-#: 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 "�� %3$s �W�� %2$s �� %1$s �A��"
 
 # camel/camel-remote-store.c:252
-#: 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
@@ -10760,16 +10892,16 @@ msgstr "�s�u�w����"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: 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�u�� %s (�� %d)�G %s"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: 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 ""
@@ -10777,7 +10909,7 @@ msgstr ""
 "�ǰe�ϥΪ̦W�ٮɵo�Ϳ��~�G%s"
 
 # shell/e-storage.c:477
-#: 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."
@@ -10785,49 +10917,41 @@ msgstr "��ʤ��䴩"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: 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 "������ѡC"
 
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "��Ƨ� `%s' ���s�b�C"
-
 # camel/providers/imap/camel-imap-store.c:456
-#: 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 ���A�� %s ���䴩�ҭn�D���������O %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: 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 "���䴩�������O %s"
 
 # camel/providers/imap/camel-imap-store.c:490
-#: 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 �п�J %s@%s �� IMAP �K�X"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: 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 "�z�S����J�K�X�C"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: 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"
@@ -10840,25 +10964,25 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: 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���o�Ӹ�Ƨ� %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 "��Ƨ��W�٤���]�t����r���C"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: 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 "���������~�G%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 "����Ƨ��ä����\�]�t�l��Ƨ�"
 
@@ -10945,8 +11069,8 @@ msgstr "�Ω�Ū�����x�s���a믶l���з� mbox �Ƶ{���ɮסC"
 
 # camel/providers/local/camel-local-store.c:127
 #: 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 "�x�s�ڥؿ� %s ���O������|"
@@ -10961,7 +11085,7 @@ msgstr "�x�s�ڥؿ� %s ���O�X�k���ؿ�"
 # camel/providers/local/camel-local-store.c:158
 #: 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 "�L�k���o��Ƨ��G%s�G%s"
@@ -10978,37 +11102,37 @@ msgid "Local mail file %s"
 msgstr "���a�ݶl���ɮ� %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: 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 "����N��Ƨ� %s ���s�R�W�� %s�G %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: 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 "�L�k�N��Ƨ��G%s ���s�R�W"
 
 # camel/providers/local/camel-local-store.c:279
-#: 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 "����R����Ƨ��K�n�ɮ� `%s'�G %s"
 
 # camel/providers/local/camel-local-store.c:289
-#: 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 "����R����Ƨ������ɮ� `%s'�G %s"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: 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 "������J�� %s ���K�n"
 
 # camel/providers/local/camel-local-summary.c:404
-#: 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 "�L�k�s�W�l���K�n��T�G��������]"
 
@@ -11038,6 +11162,7 @@ msgstr "�L�Ī��l�󤺤�"
 # camel/providers/local/camel-mh-store.c:90
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -11052,6 +11177,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "��Ƨ� `%s' ���s�b�C"
@@ -11060,6 +11186,7 @@ msgstr "��Ƨ� `%s' ���s�b�C"
 # camel/providers/local/camel-mh-store.c:103
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -11092,7 +11219,8 @@ msgstr "���O�@�� maildir �ؿ�"
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c: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 "�L�k���y��Ƨ� `%s'�G%s"
@@ -11131,7 +11259,7 @@ msgstr "�P�B�B�z��Ƨ�"
 
 # camel/providers/local/camel-mbox-folder.c:152
 #: 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 "�L�k�إ߸�Ƨ���w %s �G %s"
@@ -11346,13 +11474,13 @@ msgstr "`%s' ���O�@�ӥؿ��C"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "�L�k�}�� MH �ؿ����|�G%s�G%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 "�Ƶ{��Ƨ����୫�s�R�W"
 
 # camel/providers/local/camel-local-store.c:134
-#: 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 "�x�s�ڥؿ� %s ���O�X�k���ؿ�"
@@ -11360,31 +11488,38 @@ msgstr "�x�s�ڥؿ� %s ���O�X�k���ؿ�"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "��Ƨ� `%s/%s' ���s�b�C"
 
-#: camel/providers/local/camel-spool-store.c:162
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' ���O�@�ӦX�k���ɮסC"
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr "�Ƶ{�l���ɮ� %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 "�Ƶ{��Ƨ����୫�s�R�W"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "�Ƶ{��Ƨ����୫�s�R�W"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "�Ƶ{��Ƨ�����R��"
 
@@ -11496,7 +11631,7 @@ msgid "Operation failed: %s"
 msgstr "��ʤw����"
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "���^ POP ���K�n"
 
@@ -11504,28 +11639,28 @@ msgstr "���^ POP ���K�n"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: 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 "��ʤw����"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: 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 "�L�k���o��Ƨ��G%s�G%s"
 
 # mail/message-browser.c:199
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "�M�ŧR�����l��"
 
 # camel/providers/pop3/camel-pop3-folder.c:292
-#: 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���l��㦳�o�� uid %s"
@@ -11533,7 +11668,7 @@ msgstr "�S���l��㦳�o�� uid %s"
 # camel/providers/pop3/camel-pop3-folder.c:296
 #. 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 �l�� %d"
@@ -11545,10 +11680,10 @@ msgstr "���� POP �l�� %d"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: 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 ""
@@ -11556,7 +11691,7 @@ msgstr ""
 " %s"
 
 # camel/camel-sasl-login.c:127
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "����������"
@@ -11884,14 +12019,14 @@ msgid "Authentication required"
 msgstr "�n�D����"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: 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 ""
@@ -11899,37 +12034,37 @@ msgstr ""
 "�ǰe�ϥΪ̦W�ٮɵo�Ϳ��~�G%s"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: 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 "��Ƨ��n���w�g�l���åB����_��C"
 
 # camel/providers/smtp/camel-smtp-transport.c:1024
-#: 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 "RSET ���n�D�O�ɡG%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:356
-#: 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 ���A�� %s ���䴩�ҭn�D���������O %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:395
-#: 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 �п�J %s@%s �� SMTP �K�X"
 
 # camel/providers/smtp/camel-smtp-transport.c:418
-#: 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"
@@ -11941,109 +12076,109 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ���A�� %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: 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 "�g�� %s �ǰe SMTP �l��"
 
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: 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 "�L�k�ǰe�l��G�H��̪��a�}�L�ġC"
 
 # mail/mail-ops.c:603
-#: 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 "�ǰe�l��"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "�L�k�ǰe�l��G�S�����Ѧ���̡C"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: 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 "�L�k�ǰe�l��G�S�����Ѧ���̡C"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: 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:1024
-#: 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 ���n�D�O�ɡG%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
 # mail/mail-config.glade.h:10
-#: 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:728
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "�إ� SASL ���Ҫ���ɵo�Ϳ��~�C"
 
 # camel/providers/smtp/camel-smtp-transport.c:743
 # camel/providers/smtp/camel-smtp-transport.c:755
-#: 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 ���n�D�O�ɡG%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:764
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH �n�D���ѡC"
 
 # camel/providers/smtp/camel-smtp-transport.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "�q���A���Ǧ^�����T���Ҫ��^���C\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:835
-#: 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 ���n�D�O�ɡG%s�G�l��L�k�ǰe"
 
 # camel/providers/smtp/camel-smtp-transport.c:854
-#: 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 ���^�����~�G%s�G �l��L�k�ǰe"
 
 # camel/providers/smtp/camel-smtp-transport.c:879
-#: 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 ���n�D�O�ɡG%s�G�l��L�k�ǰe"
 
-#: 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:929
-#: 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 ���n�D�O�ɡG%s�G�l��L�k�ǰe"
@@ -12052,99 +12187,88 @@ msgstr "DATA ���n�D�O�ɡG%s�G�l��L�k�ǰe"
 #. 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 ���^�����~�G %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:963
 # camel/providers/smtp/camel-smtp-transport.c:981
-#: 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 �ǰe�O�ɡG�l��ǰe����G%s�G�l��L�k�ǰe"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "�Ӧۦ��A�������}�\�i�^���C"
 
 # camel/providers/smtp/camel-smtp-transport.c:1024
-#: 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 ���n�D�O�ɡG%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:743
 # camel/providers/smtp/camel-smtp-transport.c:755
-#: 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 ���n�D�O�ɡG%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
-# composer/e-msg-composer-attachment-bar.c:95
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 �줸"
-
-# composer/e-msg-composer-attachment-bar.c:97
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u �줸"
-
 # composer/e-msg-composer-attachment-bar.c:104
-#: 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:108
-#: 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:112
-#: 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"
 
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
 #. 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:469
-#: 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 "�����w��ܪ����[�ɮ�"
 
 # composer/e-msg-composer-attachment-bar.c:500
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "�s�W����..."
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "���[�ɮצܶl��"
 
@@ -12184,7 +12308,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "��ij�۰���ܪ���"
 
 # composer/e-msg-composer-hdrs.c:324
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "���o�̷s�W�ؿ��A��"
 
@@ -12196,7 +12320,7 @@ msgstr "���o�̷s�W�ؿ��A��"
 #. * 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 "�^�Цa�}�G"
 
@@ -12204,7 +12328,7 @@ msgstr "�^�Цa�}�G"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "�H��̡G"
 
@@ -12212,37 +12336,37 @@ msgstr "�H��̡G"
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "�D���G"
 
 # composer/e-msg-composer-hdrs.c:386
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "����̡G"
 
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "��J�l�󪺦����"
 
 # composer/e-msg-composer-hdrs.c:390
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "�ƥ��G"
 
 # composer/e-msg-composer-hdrs.c:391
-#: 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 "��J�l��ƥ��������"
 
 # composer/e-msg-composer-hdrs.c:394
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "�K��ƥ��G"
 
 # composer/e-msg-composer-hdrs.c:395
-#: 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."
@@ -12252,7 +12376,7 @@ msgstr "��J�l��K��ƥ��������"
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "�q�T��(_P)�G"
@@ -12260,7 +12384,7 @@ msgstr "�q�T��(_P)�G"
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "�y�z"
@@ -12279,7 +12403,7 @@ msgid "Could not create a PGP signature context"
 msgstr "�L�k�إߤ@�� PGP ñ�W�奻�C"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -12289,39 +12413,39 @@ msgstr ""
 "%s"
 
 # widgets/misc/e-messagebox.c:159
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "ĵ�i�I"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "�ɮפw�s�b�A�л\���H"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "�x�s�ɮ׮ɵo�Ϳ��~�G%s"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "���J�ɮ׮ɵo�Ϳ��~�G%s"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "�s���ɮ׮ɵo�Ϳ��~�G%s"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "�L�k�q�s�边���o�l��"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -12331,7 +12455,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -12341,7 +12465,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -12351,7 +12475,7 @@ msgstr ""
 " %s"
 
 # importers/pine-importer.c:705
-#: 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?"
@@ -12359,40 +12483,64 @@ msgstr ""
 "Ximian Evolution ���b�W�@���@�~�ɥ��x�s���ɮסC\n"
 "�O�_���ձN���_��H"
 
+# composer/e-msg-composer.c:941
+#: 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 ""
+"�o�ʶl�󤴥��ǰe�C\n"
+"\n"
+"�O�_���N�ܧ��x�s�H"
+
 # mail/mail-ops.c:1154
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "ĵ�i�G�ܧ�L���l��"
 
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "�}���ɮ�"
 
 # mail/mail-config.glade.h:74
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "ñ�W�ɡG"
 
-#: 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:1526
 # composer/e-msg-composer.c:1871
-#: 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��l��"
 
-#: 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/evolution-composer.c:355
-#: 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 ""
+"�L�k�إ߶l��s������A�]���z�����b\n"
+"�l�󤸥󤺳]�w���󨭥��ҩ��C"
+
+# composer/evolution-composer.c:355
+#: composer/e-msg-composer.c:2879
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -12401,14 +12549,14 @@ msgstr ""
 "�L�k�إ߶l��s������A�]���z�����b\n"
 "�l�󤸥󤺳]�w���󨭥��ҩ��C"
 
-#: 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:355
-#: 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."
@@ -12417,8 +12565,9 @@ msgstr ""
 "�l�󤸥󤺳]�w���󨭥��ҩ��C"
 
 # composer/evolution-composer.c:370
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "�����l�� Evolution ���l��s�边�C"
 
 # data/evolution.desktop.in.h:2
@@ -12481,8 +12630,8 @@ msgstr "�D�����]�t"
 
 # mail/mail-callbacks.c:1144
 # mail/mail-display.c:96
-#: 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?"
@@ -12673,7 +12822,7 @@ msgstr "�~"
 
 #: filter/filter-datespec.c:174
 #, fuzzy
-msgid "You have forgotten to choose a date."
+msgid "You must choose a date."
 msgstr "���C�z�ѤF�������C"
 
 #: filter/filter-datespec.c:269
@@ -12731,18 +12880,15 @@ msgstr "�M��"
 msgid "Add action"
 msgstr "�s�W�ʧ@"
 
+# ui/evolution.xml.h:3
 #: filter/filter-folder.c:149
 #, fuzzy
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"���C�z�ѤF����@�Ӹ�Ƨ��C\n"
-"�Ц^�Y���w�@�Ӧ��Ī���Ƨ��@�������l�󤧥ΡC"
+msgid "You must specify a folder.\n"
+msgstr "���o�Ӹ�Ƨ����W��"
 
 # mail/mail-account-gui.c:682
-#: 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 "��ܸ�Ƨ�"
 
@@ -12755,7 +12901,7 @@ msgstr ""
 "���W���ܦ��������~ '%s'�G\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 "���n"
@@ -12951,237 +13097,241 @@ msgid "Beep"
 msgstr "������"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "�]�t"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "�ƻs�ܸ�Ƨ�"
 
-#: 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 "�e����"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "�w�R��"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "���]�t"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "���O�H���׵�"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "���s�b"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "���s�b"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "������"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "���O�H���}�l"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "���s�b"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "��Z"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "�H���׵�"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "�s�b"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "�s�b"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "���y"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "�O"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "�O���᪺"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "�O���e��"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "���мm��"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "�j��"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "�p��"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "���O"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "���мm��"
-
-#: 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 "�l��C��"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "�l�󤺮e"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "�l�����Y"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "���ܸ�Ƨ�"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "�ǰe�l�󵹳s���H"
 
 # calendar/gui/event-editor-dialog.glade.h:14
 # calendar/gui/event-editor.c:1588
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "���񭵮ġG"
 
-#: 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 "���W���ܦ��۰t"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "�^��"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "�Ӱȹq��"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "�j��"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "�p��"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
 # mail/message-list.c:1081
-#: 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 "�H���"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "�]�w���A"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "���q�q��"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "�j�p (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "����"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "�ӷ��b��"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "���w���Y"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "�H���}�l"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "����B�z"
 
 # mail/mail-format.c:767
 # mail/message-list.c:1082
-#: 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 "�D��"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "�]�w���A"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "�]�t"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "���]�t"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "���O�H���׵�"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "���s�b"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "���s�b"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "������"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "���O�H���}�l"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "�H���׵�"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "�s�b"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "���мm��"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "�O���᪺"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "�O���e��"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "�j��"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "�p��"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "���мm��"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "���O"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "�O"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "�j��"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "�p��"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "�Ӱȹq��"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "����"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "�H���}�l"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "�W�h"
@@ -13220,25 +13370,25 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution ���b�פJ�z�¦��� Elm �l��"
 
 # shell/e-shell-importer.c:363
-#: 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 "�פJ..."
 
-#: 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 "�еy��"
 
 # shell/e-shell-importer.c:371
-#: 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 "�פJ %s �� %s"
 
 # mail/mail-ops.c:599
-#: 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"
@@ -13247,9 +13397,9 @@ msgstr "���y %s"
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: 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 "�l��"
 
@@ -13313,7 +13463,7 @@ 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 ���b�פJ�z�¦��� Netscape ���"
 
@@ -13323,40 +13473,40 @@ msgstr "Evolution ���b�פJ�z�¦��� Netscape ���"
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
 #. 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 "�g�ը��"
 
 # camel/providers/local/camel-local-store.c:183
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "���a�ݶl���ɮ� %s"
 
 # camel/providers/imap/camel-imap-folder.c:364
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "���y�ؿ�"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "�}�l�פJ"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "�]�w"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "�s��W�h"
 
 # importers/netscape-importer.c:847
-#: 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?"
@@ -13499,15 +13649,29 @@ msgstr "�l��պA����"
 msgid "Folder containing mail"
 msgstr "��Ƨ��]�t�l��"
 
+# calendar/gui/calendar-model.c:360
+# calendar/gui/calendar-model.c:898
+# calendar/gui/e-calendar-table.c:323
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "���}"
+
+# mail/folder-browser.c:871
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "��Ƨ��]�t�l��"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "�����U����"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "�����U������Ƨ�"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "����Ƨ�����]�t�l��C"
 
@@ -13515,102 +13679,103 @@ msgstr "����Ƨ�����]�t�l��C"
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "���e..."
 
 # ui/evolution-mail.xml.h:4
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "�ܧ�o�Ӹ�Ƨ������e"
 
-#: 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/mail-callbacks.c:202
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "�z�S���]�w�l��ǰe��k"
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
 # mail/mail-ops.c:1154
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "ĵ�i�G�ܧ�L���l��"
 
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "�s�W�l��"
 
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "�l��T��(_M)"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "�s��l��"
 
 # widgets/misc/e-messagebox.c:180
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "�U�@�ʶl��"
 
 # mail/mail-callbacks.c:1407
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "�W�@�ʶl��"
 
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "�s�W�l��"
 
 # mail/component-factory.c:337
-#: 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 "�����l�� Evolution �� mail ����C"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "�����l�� Evolution �� mail ����C"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "�����l�� Evolution �� mail ����C"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "���b�s�u�ܦ��A��..."
 
 # mail/component-factory.c:410
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "����H�� shell ���U�x�s�Ŷ�"
 
 # mail/folder-browser-factory.c:196
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" �����e"
@@ -13618,12 +13783,12 @@ msgstr "\"%s\" �����e"
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "���e"
 
 # mail/mail-display.c:236
-#: 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�ؿ��G %s"
@@ -13672,53 +13837,53 @@ msgid "%d total"
 msgstr "%d ����"
 
 # ui/evolution-mail.xml.h:10
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "�q�l��إߵ�����Ƨ�(_V)"
 
 # mail/folder-browser.c:653
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "�q�D���إߵ�����Ƨ�(_S)"
 
 # mail/folder-browser.c:656
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "�q�H��̫إߵ�����Ƨ�(_N)"
 
 # mail/folder-browser.c:659
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "�q����̫إߵ�����Ƨ�(_R)"
 
 # mail/folder-browser.c:662
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "�q�l��M��إߵ�����Ƨ�(_L)"
 
 # mail/folder-browser.c:668
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "�q�D���إ߳W�h(_J)"
 
 # mail/folder-browser.c:671
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "�q�H��̫إ߳W�h(_D)"
 
 # mail/folder-browser.c:674
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "����̳W�h(_C)"
 
 # mail/folder-browser.c:677
-#: 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 "�q�l��M��إ߳W�h(_M)"
 
 # ui/evolution-mail.xml.h:66
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "�s�謰�s�l��(_E)..."
 
@@ -13726,34 +13891,34 @@ msgstr "�s�謰�s�l��(_E)..."
 # ui/evolution-event-editor.xml.h:69
 # ui/evolution-task-editor-dialog.xml.h:82
 # ui/evolution-tasks.xml.h:7
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "�C�L(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: 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 "�^�бH���(_R)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: 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 "�^�ЦܲM��(_A)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: 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 "�^�ЩҦ��H(_A)"
 
 # mail/folder-browser.c:701
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "��H(_F)"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
@@ -13761,91 +13926,91 @@ msgstr ""
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "�w����"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�M��"
 
 # mail/folder-browser.c:704
 #. 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 "�Хܦ��w�\Ū(_K)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "�Хܦ����\Ū(_n)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "�Хܦ����n(_I)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "�Хܦ������n(_O)"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "�_��(_U)"
 
 # mail/folder-browser.c:711
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "���ܸ�Ƨ�(_M)..."
 
 # mail/folder-browser.c:713
-#: 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 "�_�s�ܸ�Ƨ�(_C)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�s�W�ǰe�̨�ؿ��A��"
 
 # mail/folder-browser.c:727
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�M�ιL�o��"
 
 # mail/folder-browser.c:731
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "�q�l��إ߳W�h(_L)"
 
 # mail/folder-browser.c:871
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "�l��M�檺������Ƨ�"
 
 # mail/folder-browser.c:873
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "�l��M�檺�L�o�� (%s)"
 
 # mail/folder-browser.c:874
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "�l��M�檺������Ƨ� (%s)"
@@ -13935,23 +14100,23 @@ msgstr "Evolution �b���s�边"
 
 # addressbook/gui/component/addressbook-config.c:401
 # mail/mail-config.glade.h:33
-#: 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 "�D��(_H)�G"
 
 # mail/mail-config.glade.h:80
-#: 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 "�ϥΪ̦W��(_U)�G"
 
 # addressbook/gui/component/addressbook-config.c:520
 # mail/mail-config.glade.h:53
-#: 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 "���|(_P)�G"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "�z����άۦP���W�٫إߨ�ӱb���C"
 
@@ -13973,16 +14138,16 @@ msgstr "�T�w�R���b���H"
 
 # mail/mail-accounts.c:197
 #: 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:199
 # mail/mail-config.glade.h:30
 #: 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 "�ҥ�"
 
@@ -14080,8 +14245,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 ""
 
 # calendar/gui/event-editor-dialog.glade.h:23
@@ -14126,7 +14291,7 @@ msgid "You must specify recipients in order to send this message."
 msgstr "�z�������w����̤~�i�e�X�l��C"
 
 # composer/e-msg-composer.c:877
-#: 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?"
@@ -14136,32 +14301,32 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "�������H���"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "�b %a, %Y-%m-%d %H:%M, %%s �g�D�G"
 
 # mail/mail-callbacks.c:850
-#: 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 "�N�l�󲾦�"
 
 # mail/mail-callbacks.c:852
-#: 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 "�N�l��ƻs��"
 
 # mail/mail-callbacks.c:1017
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�z�T�w�n�s����� %d �ʶl��H"
 
 # mail/mail-callbacks.c:1039
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -14170,7 +14335,7 @@ msgstr ""
 "��Z��Ƨ������l��C"
 
 # mail/mail-callbacks.c:1073
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -14179,45 +14344,45 @@ msgstr ""
 "�����l�󭫶ǡC"
 
 # mail/mail-callbacks.c:1085
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�z�T�w�n���s�ǰe���� %d �ʶl��H"
 
 # mail/mail-callbacks.c:1106
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "�S����w�l��"
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "�л\�ɮסH"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "�t�s�l��..."
 
 # mail/mail-callbacks.c:1190
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "�t�s�l��..."
 
 # ui/evolution-mail.xml.h:23
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "��ܤU�@�ʥ��\Ū���l��"
 
-#: 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"
@@ -14230,7 +14395,7 @@ msgstr ""
 "�T�w�M���o�Ƕl��H"
 
 # mail/mail-callbacks.c:1349
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -14241,37 +14406,37 @@ msgstr ""
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "�L�o��"
 
 # camel/camel-filter-driver.c:748
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���b������ %d / %d �ʶl��"
 
 # mail/mail-callbacks.c:1407
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "�C�L�l��"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr ""
 
 # mail/mail-callbacks.c:1454
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "�C�L�l�󥢱�"
 
 # mail/mail-callbacks.c:1549
-#: 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 "�z�T�w�n�ηs�����}�ҥ��� %d �ʶl��H"
 
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
@@ -14280,35 +14445,35 @@ msgstr ""
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-composer-prefs.c: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 "�y�z"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: 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 "���R�W���s���H"
 
 # ui/evolution-message-composer.xml.h:26
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "�ǰe"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "�s�W����"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "_HTML ñ�W�ɡG"
@@ -14370,18 +14535,18 @@ msgid "Evolution Account Assistant"
 msgstr "Evolution �b���U�z"
 
 # mail/mail-config.glade.h:3
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�b��"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "�ˬd�A��"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: 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 "���b�s�u�ܦ��A��..."
 
@@ -15240,94 +15405,90 @@ msgid "Could not create a S/MIME decode context."
 msgstr "�L�k�إߤ@�� S/MIME �ѱK�奻�C"
 
 # mail/mail-display.c:196
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "�x�s���[�ɮ�"
 
 # mail/mail-tools.c:145
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "�L�k�إ߼Ȧs mbox `%s'�G%s"
 
 # mail/mail-display.c:196
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "�x�s���[�ɮ�"
 
 # mail/mail-display.c:301
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "�˵� Inline"
 
 # mail/mail-display.c:299
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "�b %s ���}��..."
 
 # mail/mail-display.c:359
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "�˵� Inline (�z�L %s)"
 
 # mail/mail-display.c:363
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "����"
 
 # mail/mail-display.c:336
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "�~���˵���"
 
 # ui/evolution-mail.xml.h:46
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "���J�Ϥ�(_I)"
 
 # mail/mail-display.c:962
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "���b���J�l�󤺤�"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "�L�����u�@(_V)�G"
 
 # mail/message-list.c:977
-#: 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:1256
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "�b�s�������}�ҳs��"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "�ƻs�s����}"
 
 # ui/evolution-message-composer.xml.h:21
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "�t�s�ؼ�(FIXME)"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "�t�s�Ϥ�..."
 
@@ -15338,57 +15499,58 @@ msgid "Pinging %s"
 msgstr "���y %s"
 
 # mail/mail-format.c:527
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s ���[�ɮ�"
 
 # mail/mail-format.c:573
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "����ѪR MIME �榡���l��C�u�n��ܭ�l�ɡC"
 
 # mail/mail-format.c:640
 # mail/message-list.c:1082
-#: 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-config.glade.h:29
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "�����T���q�l�a�}"
 
 # mail/mail-format.c:756
 # mail/message-list.c:1082
-#: 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 "�H���"
 
 # mail/mail-format.c:759
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "�^��"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: 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:765
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "�ƥ�"
 
 # composer/e-msg-composer-hdrs.c:394
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 #, fuzzy
 msgid "Bcc"
 msgstr "�K��ƥ��G"
 
 # addressbook/backend/ebook/e-card.c:3428
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -15396,76 +15558,76 @@ msgstr ""
 "�H���: "
 
 # mail/mail-format.c:1153
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "�o�ʬO�[�J�F�Ʀ�ñ�W���l��A�w����L�_"
 
 # mail/mail-crypto.c:84
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�L�k�إߤ@�� PGP �d���奻�C"
 
 # mail/mail-format.c:1153
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "�o�ʬO�[�J�F�Ʀ�ñ�W���l��A�w����L�_"
 
 # mail/mail-format.c:1161
-#: 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 "�o�ʬO�[�J�F�Ʀ�ñ�W���l��A���������L�_"
 
 # mail/mail-format.c:1787
-#: 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:1799
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "���a���ɮ� (%s) �� \"%s\" ���Ī�����"
 
 # mail/mail-format.c:1803
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "���a�ɮ׫��� (%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:1837
-#: 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:1842
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "�ܧΪ��~�[���峡���C"
 
 # mail/mail-config.glade.h:76
-#: 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 "�S�O��Ƨ�"
 
 # mail/mail-local.c:812
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "���s���J��Ƨ�"
 
 # mail/mail-local.c:922
-#: 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"
@@ -15475,14 +15637,14 @@ msgstr ""
 "�A�]�L�k�}�ҳo�Ӹ�Ƨ��G %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�L�k�إ߸�Ƨ���w %s �G %s"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -15490,18 +15652,13 @@ msgstr ""
 "%s"
 
 # mail/mail-local.c:785
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�N��Ƨ� \"%s\" �榡�ܧ� \"%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:961
-#: 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."
@@ -15509,17 +15666,17 @@ msgstr ""
 "�p�G�z�L�k�}�ҳo�ӫH�c�A����\n"
 "�z�i��ݭn��ʭ״_���C"
 
-# camel/camel-vtrash-folder.c:109
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "�z�����ܧ�D���a�ݸ�Ƨ����榡�C"
-
 # executive-summary/component/e-summary-url.c:80
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "���s�]�w %s"
 
+# camel/camel-vtrash-folder.c:109
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "�z�����ܧ�D���a�ݸ�Ƨ����榡�C"
+
 # mail/mail-mt.c:190
 #: mail/mail-mt.c:257
 #, c-format
@@ -15817,16 +15974,16 @@ msgstr "�ϥΪ̨����ʧ@�C"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "�O�U�o�ӱK�X(_R)"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
 # camel/camel-smime-context.c:194
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "�п�J %s �Ҷ����K�X"
@@ -15837,7 +15994,7 @@ msgstr "�п�J %s �Ҷ����K�X"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 #, fuzzy
 msgid "Enter Password"
 msgstr "�K�X"
@@ -15849,12 +16006,12 @@ msgid "Could not save signature file: %s"
 msgstr "�L�k�إߤ@�� PGP ñ�W�奻�C"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "�x�sñ�W��"
 
 # composer/e-msg-composer.c:941
-#: 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"
@@ -15864,13 +16021,13 @@ msgstr ""
 "\n"
 "�z�O�_�n�x�s�ܧ�H"
 
-#: 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 ""
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: 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 "�W�١G"
 
@@ -15914,7 +16071,7 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: 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 "��Ƨ�"
@@ -15953,82 +16110,82 @@ msgid "%s - Message"
 msgstr "%s - �l��"
 
 # mail/message-list.c:677
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "���\Ū"
 
 # mail/message-list.c:678
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "�w�\Ū"
 
 # mail/message-list.c:679
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "�w�^��"
 
 # mail/message-list.c:680
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "�h�ӥ��\Ū���l��"
 
 # mail/message-list.c:681
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "�h�Ӷl��"
 
 # mail/message-list.c:685
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "�̧C"
 
 # mail/message-list.c:686
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "�C"
 
 # mail/message-list.c:690
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "��"
 
 # mail/message-list.c:691
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "�̰�"
 
 # mail/message-list.c:941
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "�H"
 
 # mail/message-list.c:948
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
 # mail/message-list.c:957
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "�Q�� %l:%M %p"
 
 # mail/message-list.c:969
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:977
-#: 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:979
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "���Ͷl��M��"
 
@@ -16121,52 +16278,86 @@ msgstr "�����^��"
 msgid "Review"
 msgstr "�w��"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "�w����"
+
+#: 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 ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Clear Flag"
+msgstr "�M��"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/e-calendar-table.c:155
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "����"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "���мm��"
+
 # mail/mail-ops.c:992
-#: mail/subscribe-dialog.c:228
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "���y \"%s\" �W��� %s �̪���Ƨ�"
 
 # mail/mail-ops.c:992
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "���y \"%s\" �W�޲z�̼h�Ū���Ƨ�"
 
 # mail/subscribe-dialog.c:271
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "�q�\�ܸ�Ƨ� \"%s\""
 
 # mail/subscribe-dialog.c:273
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "�����q�\�ܸ�Ƨ� \"%s\""
 
 # mail/subscribe-dialog.c:76
 # shell/e-storage-set-view.c:48
-#: 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 "��Ƨ�"
 
 # ui/evolution-message-composer.xml.h:22
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "�x�s�ܸ�Ƨ�..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "�|����ܦ��A��"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "�п�ܤ@�Ӧ��A���C"
 
@@ -28171,13 +28362,13 @@ msgid "No description"
 msgstr "�y�z"
 
 # calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "�l��K�n"
 
 # mail/mail-config.glade.h:76
-#: 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 "�S�O��Ƨ�"
@@ -28188,23 +28379,23 @@ msgstr "�S�O��Ƨ�"
 #. (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 "Dictionary.com �C��@�r"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "�C��@��"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "�s�W�s�D�o�e���A��"
 
-#: 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 "��J�z�Ʊ�s�W�s�D�o�e���A�����}"
 
@@ -28257,13 +28448,13 @@ msgstr "�y�z�G"
 msgid "My Weather"
 msgstr "�ڪ��Ѯ�"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "�U���s�D�o�e���A���ɵo�Ϳ��~"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "�Ѯ�"
 
@@ -29677,6 +29868,12 @@ msgstr ""
 "�L�k�R����Ƨ��G\n"
 "%s"
 
+# mail/mail-display.c:299
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "�b %s ���}��..."
+
 # mail/subscribe-dialog.c:76
 # shell/e-storage-set-view.c:48
 #: shell/e-folder-list.c:312
@@ -29960,13 +30157,28 @@ msgstr "���s�R�W��Ƨ� '%s'"
 
 # shell/e-shell-folder-creation-dialog.c:156
 #: 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 "���w����Ƨ��W�٤��X�k�G %s"
 
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"�L�k�R����Ƨ��G\n"
+"%s"
+
 # shell/e-shell-folder-creation-dialog.c:99
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -29976,13 +30188,13 @@ msgstr ""
 "%s"
 
 # ui/evolution.xml.h:8
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "�s�W��Ƨ�(_N)..."
 
 # shell/e-shell-folder-selection-dialog.c:328
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "�s�W..."
 
@@ -30013,23 +30225,9 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-# shell/e-shell-importer.c:192
-#. 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 ""
-"���b�פJ %s\n"
-"�פJ�A�Ȥ����N���C\n"
-"���� 5 ����A�աC"
-
 # shell/e-shell-importer.c:212
 # shell/e-shell-importer.c:243
-#: 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"
@@ -30039,7 +30237,7 @@ msgstr ""
 "�פJ���� %d�C"
 
 # mail/mail-account-gui.c:682
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "��ܸ�Ƨ�"
@@ -30047,7 +30245,7 @@ msgstr "��ܸ�Ƨ�"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "�ɮ� %s ���s�b"
@@ -30055,14 +30253,14 @@ msgstr "�ɮ� %s ���s�b"
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: 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:353
-#: 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"
@@ -30072,12 +30270,12 @@ msgstr ""
 "%s"
 
 # shell/e-shell-importer.c:363
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "�פJ"
 
 # shell/e-shell-importer.c:371
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -30087,19 +30285,19 @@ msgstr ""
 "���b�Ұ� %s"
 
 # shell/e-shell-importer.c:384
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "�Ұ� %s �ɵo�Ϳ��~"
 
 # shell/e-shell-importer.c:404
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "���J %s �ɵo�Ϳ��~"
 
 # shell/e-shell-importer.c:419
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -30109,37 +30307,37 @@ msgstr ""
 "���b�פJ���� 1�C"
 
 # shell/e-shell-importer.c:490
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "�۰�"
 
 # shell/e-shell-importer.c:540
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "�ɮצW�١G"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "��ܤ@���ɮ�"
 
 # shell/e-shell-importer.c:555
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "�ɮ����O�G"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr ""
 
 # ui/evolution.xml.h:21
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 #, fuzzy
 msgid "Import a single file"
 msgstr "�פJ�~���ɮ׮榡"
 
-#: 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"
@@ -30147,23 +30345,23 @@ msgstr ""
 "�еy��...\n"
 "���b���y�{�s���]�w"
 
-#: 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 "�Ұʴ��z���פJ�A��"
 
 # composer/e-msg-composer-hdrs.c:355
-#: 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 "�H��̡G"
 
 # shell/e-shell-importer.c:601
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "��ܸ�Ƨ�"
 
 # shell/e-shell-importer.c:602
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "��ܥت���Ƨ��Χ@�פJ�o�Ǹ��"
 
@@ -30172,7 +30370,7 @@ msgstr "��ܥت���Ƨ��Χ@�פJ�o�Ǹ��"
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: 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 "�פJ"
 
@@ -30210,39 +30408,39 @@ msgstr "�P�B�B�z '%s'"
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "�}�Ҹ�Ƨ� %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: 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"
 
 # mail/mail-display.c:299
-#: 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 "�b %s ���}��..."
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: 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 "�L�k�N��Ƨ��G%s ���s�R�W"
 
 # shell/e-shell-folder-creation-dialog.c:99
-#: 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 ""
@@ -30294,55 +30492,55 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "'.' �M '..' �O��Ƨ��O�d�W�١C"
 
 # shell/e-shell-view-menu.c:179
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "�g�� $PATH �ҫ��w�����|�]�䤣�� Bug buddy �{���C"
 
 # shell/e-shell-view-menu.c:185
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "�L�k���� Bug buddy�C"
 
 # ui/evolution.xml.h:1
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "���� Ximian Evolution..."
 
 # shell/e-shell-view-menu.c:410
-#: 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:411
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "��ܱz�Q�}�Ҫ���Ƨ�"
 
 # shell/e-shortcuts-view.c:292
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "�s�W�@�ӱ��|"
 
 # shell/e-shell-view-menu.c:411
-#: 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 "��ܱz�Q���|�����쪺��Ƨ��G"
 
 # shell/e-shell-view-menu.c:590
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 #, fuzzy
 msgid "_Work Online"
 msgstr "�u�W�u�@"
 
 # ui/evolution.xml.h:66
-#: 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 "���u�u�@(_W)"
 
 # ui/evolution.xml.h:39
-#: 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 "���u�u�@"
 
@@ -30351,26 +30549,26 @@ msgstr "���u�u�@"
 msgid "(No folder displayed)"
 msgstr "(�S����Ƨ����)"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
 # shell/e-storage.c:178
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(�S��)"
 
-#: 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 �ثe���u�W�u�@�C���o�̧אּ���u�u�@�C"
 
-#: 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 �{�����u���C"
 
-#: 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 "Ximian Evolution �ثe�O���u�u�@�C���o�̧אּ�u�W�u�@�C"
@@ -30384,12 +30582,12 @@ msgid ""
 msgstr ""
 
 # shell/e-shell.c:392
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�L�k�]�w���a�ݪ��x�s�Ŷ� -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -30399,20 +30597,20 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "�L�Ī��Ѽ�"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "����� OAF ���U"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "�䤣��պA��Ʈw"
 
 # shell/e-storage.c:461
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "�@����~"
 
@@ -30586,69 +30784,73 @@ msgid "Checkbox"
 msgstr ""
 
 # shell/e-storage.c:459
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "�S�����~"
 
 # shell/e-storage.c:463
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "�ۦP�W�٪���Ƨ��w�g�s�b"
 
 # shell/e-storage.c:465
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "�ҫ��w����Ƨ����O�O�L�Ī�"
 
 # shell/e-storage.c:467
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "��X/�J���~"
 
 # shell/e-storage.c:469
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "�S�������Ŷ��h�إ߸�Ƨ�"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr ""
 
 # shell/e-storage.c:471
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "�䤣����w����Ƨ�"
 
 # shell/e-storage.c:473
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "�o���x�s�Ŷ����\�ऴ����@"
 
 # shell/e-storage.c:477
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "��ʤ��䴩"
 
 # shell/e-storage.c:479
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "�o���x�s�Ŷ����䴩�ҫ��w�����O"
 
 # shell/e-storage.c:471
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "���w����Ƨ�����s��β���"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "������Ƨ��m���l��Ƨ����U"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "�L�k�إ߸�Ƨ���w %s �G %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 (...)"
@@ -30917,7 +31119,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 ""
@@ -30932,37 +31134,32 @@ msgstr "�� \"�פJ\" �}�l�N�ɮ׶פJ�� Evolution�C"
 msgid "Evolution Import Assistant"
 msgstr "Evolution �פJ�U�z"
 
-# shell/importer/import.glade.h:3
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution �פJ�U�z"
-
-#: shell/importer/import.glade.h:4
 #, fuzzy
 msgid "Import File (step 3 of 3)"
 msgstr "�פJ�ɮ� (�B�J 2 �� 2)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 #, fuzzy
 msgid "Importer Type (step 1 of 3)"
 msgstr "�פJ�ɮ� (�B�J 2 �� 2)"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 #, fuzzy
 msgid "Select Importers (step 2 of 3)"
 msgstr "��ܤ@���ɮ� (�B�J 2 �� 1)"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 #, fuzzy
 msgid "Select a File (step 2 of 3)"
 msgstr "��ܤ@���ɮ� (�B�J 2 �� 1)"
 
 # shell/importer/import.glade.h:6
-#: 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"
@@ -31244,10 +31441,10 @@ msgstr "�ثe�ɶ�"
 #: 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)"
 
@@ -31406,7 +31603,7 @@ msgstr "�C�L�o�Ӷ���"
 # ui/evolution-task-editor-dialog.xml.h:50
 # widgets/misc/e-filter-bar.c:241
 #: 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 "�x�s"
 
@@ -31445,7 +31642,7 @@ msgstr "�x�s�o�Ӷ��ب�Ϻ�"
 #: 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 "�ɮ�(_F)"
 
@@ -31554,7 +31751,8 @@ msgstr "���o�Ӷ��ئw�Ƥ@�ӷ|ij"
 
 # shell/e-shell-view.c:1203
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "�ۭq�ڪ� Evolution"
 
 # ui/evolution-mail.xml.h:3
@@ -31616,36 +31814,37 @@ msgstr "���g�s�l��(_N)"
 msgid "Post a message to a Public folder"
 msgstr "�x�s�l����Ƨ�"
 
-# ui/evolution-mail.xml.h:86
+# mail/subscribe-dialog.c:271
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "�q�\�ܸ�Ƨ�(_S)..."
+
+# ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "��ܶl��w������"
 
 # ui/evolution-mail.xml.h:90
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "�q�\�Ψ����q�\�b���ݦ��A������Ƨ�"
 
 # ui/evolution-mail.xml.h:99
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "������Ƨ��s�边(_E)..."
 
 # ui/evolution-mail.xml.h:105
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "�L�o��(_F)..."
 
 # calendar/gui/event-editor-dialog.glade.h:15
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "�w������(_P)"
 
-# mail/subscribe-dialog.c:271
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "�q�\�ܸ�Ƨ�(_S)..."
-
 # ui/evolution-mail.xml.h:4
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
@@ -31767,7 +31966,7 @@ msgstr "�R��(_E)"
 
 # ui/evolution-mail.xml.h:106
 # ui/evolution.xml.h:50
-#: 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 "��� (_F)"
 
@@ -32165,7 +32364,8 @@ msgstr "�j�M��ܪ��l�󥻤夤����r"
 # ui/evolution-event-editor.xml.h:50
 # ui/evolution-task-editor-dialog.xml.h:59
 #: 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 "�]�w�ثe�L�����������]�w"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -32315,7 +32515,7 @@ msgstr "���s�R�W(_R)..."
 # ui/evolution-event-editor.xml.h:74
 # ui/evolution-task-editor-dialog.xml.h:88
 # ui/evolution.xml.h:64
-#: 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 "�u��(_T)"
 
@@ -32337,7 +32537,7 @@ msgstr "�����o�ӵ���"
 #: 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 "����(_C)"
 
@@ -32346,7 +32546,7 @@ msgstr "����(_C)"
 # ui/evolution-task-editor-dialog.xml.h:90
 # ui/evolution.xml.h:65
 #: 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 "�˵�(_V)"
 
@@ -32582,7 +32782,7 @@ msgstr "�x�s�o�Ӷ��ب�������ܲ�"
 # ui/evolution-message-composer.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:72
 # ui/evolution.xml.h:53
-#: 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 "����(_H)"
 
@@ -32790,7 +32990,7 @@ msgid "Open Other _User's Folder..."
 msgstr "�s�W��Ƨ�(_N)..."
 
 #: 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:24
@@ -32809,108 +33009,126 @@ msgstr "�ϥηs�����}�ҳo�Ӹ�Ƨ�"
 msgid "Pi_lot Settings..."
 msgstr "�l��]�w(_M)..."
 
-# ui/evolution-mail.xml.h:81
+# ui/evolution-mail.xml.h:110
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "�l��]�w(_M)..."
+
+# ui/evolution.xml.h:8
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "�s�W��Ƨ�(_N)..."
+
+# ui/evolution-mail.xml.h:81
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "�ǰe / ����"
 
 # ui/evolution-mail.xml.h:82
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "�ǰe�ݰe���l��α����s�l��"
 
 # mail/mail-config.glade.h:40
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "�l��]�w"
+
+# mail/mail-config.glade.h:40
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "�l��]�w"
 
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "������� Ximian Evolution ����T"
 
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "�ǰe���~���i"
 
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "�ǰe���~���i(_B)"
 
 # ui/evolution.xml.h:30
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "�ϥ� Bug Buddy �e�X���~���i�C"
 
 # ui/evolution.xml.h:31
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "����"
 
 # ui/evolution.xml.h:32
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "������Ƨ��M�檺��ܪ��A"
 
 # ui/evolution.xml.h:33
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "������ƥ\��C����ܪ��A"
 
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "�������u/�b�u�u�@�����A�C"
 
 # ui/evolution.xml.h:38
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "�˵���w����Ƨ�"
 
 # ui/evolution.xml.h:16
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
 # ui/evolution.xml.h:40
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "���� Ximian Evolution(_A)..."
 
 # ui/evolution.xml.h:45
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "�ƻs(_C)..."
 
 # ui/evolution.xml.h:51
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "��Ƨ��M��(_F)"
 
 # ui/evolution-mail.xml.h:106
 # ui/evolution.xml.h:50
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "��� (_F)"
 
 # ui/evolution.xml.h:52
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "���ܸ�Ƨ�(_G)..."
 
 # shell/e-shell-importer.c:363
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 #, fuzzy
 msgid "_Import..."
 msgstr "�פJ..."
 
 # ui/evolution.xml.h:57
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "����(_M)..."
 
@@ -32918,38 +33136,44 @@ msgstr "����(_M)..."
 # ui/evolution-event-editor.xml.h:66
 # ui/evolution-task-editor-dialog.xml.h:79
 # ui/evolution.xml.h:58
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "�s�W(_N)"
 
 # ui/evolution.xml.h:59
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "�s�W��Ƨ�(_N)"
 
-# calendar/gui/event-editor-dialog.glade.h:13
-#: ui/evolution.xml.h:56
+# ui/evolution.xml.h:8
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "�D�g���ʬ��|(_N)"
+msgid "_Remove Other User's Folder"
+msgstr "�s�W��Ƨ�(_N)..."
 
 # ui/evolution.xml.h:61
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "���s�R�W(_R)..."
 
 # ui/evolution-mail.xml.h:119
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "�ǰe / ���� (_S)"
 
+# ui/evolution-mail.xml.h:110
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "�l��]�w(_M)..."
+
 # ui/evolution.xml.h:62
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "�\��C(_S)"
 
 # ui/evolution.xml.h:62
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "�\��(_S)"
@@ -33237,12 +33461,12 @@ msgid "..."
 msgstr "..."
 
 # mail/mail-search.c:299
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "�M��s�边"
 
 # widgets/misc/e-filter-bar.c:168
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "�x�s�j�M���G"
 
@@ -33345,6 +33569,66 @@ msgstr "init_corba()�G�����l�� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()�G�����l�� Bonobo"
 
+# addressbook/gui/component/select-names/e-select-names-popup.c:161
+# composer/e-msg-composer-attachment-bar.c:468
+# shell/e-shortcuts-view.c:265
+# shell/e-shortcuts-view.c:388
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "����(_R)"
+
+# addressbook/contact-editor/contact-editor.glade.h:17
+# mail/mail-config.glade.h:84
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "�s�W (_A)"
+
+# mail/mail-ops.c:992
+#~ msgid "Scanning for new messages"
+#~ msgstr "���y�s�l��"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "��Ƨ� `%s' ���s�b�C"
+
+# composer/e-msg-composer-attachment-bar.c:95
+#~ msgid "1 byte"
+#~ msgstr "1 �줸"
+
+# composer/e-msg-composer-attachment-bar.c:97
+#~ msgid "%u bytes"
+#~ msgstr "%u �줸"
+
+#, fuzzy
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "���C�z�ѤF����@�Ӹ�Ƨ��C\n"
+#~ "�Ц^�Y���w�@�Ӧ��Ī���Ƨ��@�������l�󤧥ΡC"
+
+# shell/e-shell-importer.c:192
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "���b�פJ %s\n"
+#~ "�פJ�A�Ȥ����N���C\n"
+#~ "���� 5 ����A�աC"
+
+# shell/importer/import.glade.h:3
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolution �פJ�U�z"
+
+# calendar/gui/event-editor-dialog.glade.h:13
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "�D�g���ʬ��|(_N)"
+
 # camel/camel-folder-search.c:338
 #, fuzzy
 #~ msgid "Error in search expression."
@@ -33394,16 +33678,6 @@ msgstr "init_bonobo()�G�����l�� Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "�ʮu��"
 
-# composer/e-msg-composer.c:941
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "�o�ʶl�󤴥��ǰe�C\n"
-#~ "\n"
-#~ "�O�_���N�ܧ��x�s�H"
-
 # mail/mail-accounts.c:121
 # mail/mail-accounts.c:165
 #, fuzzy
@@ -34394,10 +34668,6 @@ msgstr "init_bonobo()�G�����l�� Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "�u�@(_T)..."
 
-# ui/evolution-mail.xml.h:110
-#~ msgid "_Mail Settings..."
-#~ msgstr "�l��]�w(_M)..."
-
 # ui/evolution-mail.xml.h:35
 #~ msgid "Forward _Attached"
 #~ msgstr "��H���[�ɮ�(_A)"